You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tw...@apache.org on 2002/01/29 02:00:32 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/xni QName.java
twl 02/01/28 17:00:32
Modified: java/src/org/apache/xerces/impl/dtd AbstractDTDGrammar.java
java/src/org/apache/xerces/impl/dtd/models
ContentModelValidator.java MixedContentModel.java
java/src/org/apache/xerces/impl/dv/dtd
AbstractDatatypeValidator.java
DatatypeValidator.java ENTITYDatatypeValidator.java
IDDatatypeValidator.java
IDREFDatatypeValidator.java
NOTATIONDatatypeValidator.java
java/src/org/apache/xerces/impl/dv/xs
AbstractDateTimeDV.java DateDV.java DateTimeDV.java
DayDV.java DurationDV.java MonthDV.java
MonthDayDV.java TimeDV.java YearDV.java
YearMonthDV.java
java/src/org/apache/xerces/impl/validation EntityState.java
java/src/org/apache/xerces/impl/xs/identity Selector.java
java/src/org/apache/xerces/parsers AbstractDOMParser.java
DTDParser.java
java/src/org/apache/xerces/util NamespaceSupport.java
java/src/org/apache/xerces/xni QName.java
Log:
Javadoc fixes for org.apache.xerces.impl.dv
Revision Changes Path
1.5 +16 -14 xml-xerces/java/src/org/apache/xerces/impl/dtd/AbstractDTDGrammar.java
Index: AbstractDTDGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/AbstractDTDGrammar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractDTDGrammar.java 28 Jan 2002 19:33:34 -0000 1.4
+++ AbstractDTDGrammar.java 29 Jan 2002 01:00:29 -0000 1.5
@@ -102,7 +102,7 @@
* @author Eric Ye, IBM
* @author Andy Clark, IBM
*
- * @version $Id: AbstractDTDGrammar.java,v 1.4 2002/01/28 19:33:34 lehors Exp $
+ * @version $Id: AbstractDTDGrammar.java,v 1.5 2002/01/29 01:00:29 twl Exp $
*/
public abstract class AbstractDTDGrammar implements EntityState, Grammar {
@@ -328,7 +328,7 @@
* @param elementDeclName
* @param scope
*
- * @return
+ * @return index of the elementDeclName in scope
*/
public int getElementDeclIndex(String elementDeclName, int scope) {
int mapping = fScopeMapping.get(scope, elementDeclName, null);
@@ -342,7 +342,7 @@
* @param elementDeclQName
* @param scope
*
- * @return
+ * @return index of elementDeclQName in scope
*/
public int getElementDeclIndex(QName elementDeclQName, int scope) {
int mapping = fScopeMapping.get(scope, elementDeclQName.localpart, elementDeclQName.uri);
@@ -398,7 +398,7 @@
*
* @param elementDeclIndex
*
- * @return int
+ * @return index of the first attribute for element declaration elementDeclIndex
*/
public int getFirstAttributeDeclIndex(int elementDeclIndex) {
int chunk = elementDeclIndex >> CHUNK_SHIFT;
@@ -412,7 +412,7 @@
*
* @param attributeDeclIndex
*
- * @return
+ * @return index of the next attribute of the attribute at attributeDeclIndex
*/
public int getNextAttributeDeclIndex(int attributeDeclIndex) {
int chunk = attributeDeclIndex >> CHUNK_SHIFT;
@@ -427,7 +427,7 @@
* @param elementDeclIndex
* @param attributeDeclName
*
- * @return
+ * @return index of the attribue named attributeDeclName for the element with index elementDeclIndex
*/
public int getAttributeDeclIndex(int elementDeclIndex, String attributeDeclName) {
// REVISIT: [Q] How is this supposed to be overridden efficiently by
@@ -441,7 +441,7 @@
* @param attributeDeclIndex
* @param attributeDecl The values of this structure are set by this call.
*
- * @return
+ * @return true if getAttributeDecl was able to fill in the value of attributeDecl
*/
public boolean getAttributeDecl(int attributeDeclIndex, XMLAttributeDecl attributeDecl) {
if (attributeDeclIndex < 0 || attributeDeclIndex >= fAttributeDeclCount) {
@@ -496,7 +496,7 @@
/**
* getFirstEntityDeclIndex
*
- * @return
+ * @return index of the first EntityDecl
*/
public int getFirstEntityDeclIndex() {
throw new RuntimeException("implement Grammar#getFirstEntityDeclIndex():int");
@@ -507,7 +507,7 @@
*
* @param elementDeclIndex
*
- * @return
+ * @return index of the next EntityDecl
*/
public int getNextEntityDeclIndex(int elementDeclIndex) {
throw new RuntimeException("implement Grammar#getNextEntityDeclIndex(int):int");
@@ -518,7 +518,7 @@
*
* @param entityDeclName
*
- * @return
+ * @return the index of the EntityDecl
*/
public int getEntityDeclIndex(String entityDeclName) {
if (entityDeclName == null) {
@@ -541,7 +541,8 @@
* @param entityDeclIndex
* @param entityDecl
*
- * @return
+ * @return true if getEntityDecl was able to fill entityDecl with the contents of the entity
+ * with index entityDeclIndex
*/
public boolean getEntityDecl(int entityDeclIndex, XMLEntityDecl entityDecl) {
if (entityDeclIndex < 0 || entityDeclIndex >= fEntityCount) {
@@ -565,7 +566,7 @@
/**
* getFirstNotationDeclIndex
*
- * @return
+ * @return the index of the first notation declaration in the grammar
*/
public int getFirstNotationDeclIndex() {
throw new RuntimeException("implement Grammar#getFirstNotationDeclIndex():int");
@@ -576,7 +577,7 @@
*
* @param elementDeclIndex
*
- * @return
+ * @return index of the next notation declaration in the grammar
*/
public int getNextNotationDeclIndex(int elementDeclIndex) {
throw new RuntimeException("implement Grammar#getNextNotationDeclIndex(int):int");
@@ -610,7 +611,8 @@
* @param notationDeclIndex
* @param notationDecl
*
- * @return
+ * @return return true of getNotationDecl can fill notationDecl with information about
+ * the notation at notationDeclIndex.
*/
public boolean getNotationDecl(int notationDeclIndex, XMLNotationDecl notationDecl) {
if (notationDeclIndex < 0 || notationDeclIndex >= fNotationCount) {
1.3 +5 -2 xml-xerces/java/src/org/apache/xerces/impl/dtd/models/ContentModelValidator.java
Index: ContentModelValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/models/ContentModelValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentModelValidator.java 28 Jan 2002 19:33:35 -0000 1.2
+++ ContentModelValidator.java 29 Jan 2002 01:00:29 -0000 1.3
@@ -60,7 +60,7 @@
import org.apache.xerces.xni.QName;
/**
- * @version $Id: ContentModelValidator.java,v 1.2 2002/01/28 19:33:35 lehors Exp $
+ * @version $Id: ContentModelValidator.java,v 1.3 2002/01/29 01:00:29 twl Exp $
*/
public interface ContentModelValidator {
@@ -75,7 +75,10 @@
* @param offset
* @param length
*
- * @return
+ * @return The value -1 if fully valid, else the 0 based index of the child
+ * that first failed. If the value returned is equal to the number
+ * of children, then the specified children are valid but additional
+ * content is required to reach a valid ending state.
*/
public int validate(QName[] children, int offset, int length);
1.3 +1 -10 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MixedContentModel.java 28 Jan 2002 19:33:35 -0000 1.2
+++ MixedContentModel.java 29 Jan 2002 01:00:29 -0000 1.3
@@ -62,7 +62,7 @@
import org.apache.xerces.impl.dtd.XMLContentSpec;
/**
- * @version $Id: MixedContentModel.java,v 1.2 2002/01/28 19:33:35 lehors Exp $
+ * @version $Id: MixedContentModel.java,v 1.3 2002/01/29 01:00:29 twl Exp $
*
* MixedContentModel is a derivative of the abstract content model base
* class that handles the special case of mixed model elements. If an element
@@ -139,15 +139,6 @@
// ContentModelValidator methods
//
- /**
- * validate
- *
- * @param children
- * @param offset
- * @param length
- *
- * @return
- */
/**
* Check that the specified content is valid according to this
1.3 +4 -3 xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/AbstractDatatypeValidator.java
Index: AbstractDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/AbstractDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDatatypeValidator.java 28 Jan 2002 19:33:35 -0000 1.2
+++ AbstractDatatypeValidator.java 29 Jan 2002 01:00:30 -0000 1.3
@@ -60,7 +60,7 @@
import java.util.Hashtable;
/**
- * @version $Id: AbstractDatatypeValidator.java,v 1.2 2002/01/28 19:33:35 lehors Exp $
+ * @version $Id: AbstractDatatypeValidator.java,v 1.3 2002/01/29 01:00:30 twl Exp $
*/
public class AbstractDatatypeValidator
implements DatatypeValidator {
@@ -103,7 +103,7 @@
/**
* getFacets
*
- * @return
+ * @return A Hashtable containing the facets for this datatype.
*/
public Hashtable getFacets() {
return null;
@@ -125,7 +125,8 @@
* @param value1
* @param value2
*
- * @return
+ * @return 0 if value1 and value2 are equal, a value less than 0 if value1 is less than value2,
+ * a value greater than 0 if value1 is greater than value2
*/
public int compare(String value1, String value2)
throws InvalidDatatypeValueException {
1.3 +4 -3 xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/DatatypeValidator.java
Index: DatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/DatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatatypeValidator.java 28 Jan 2002 19:33:35 -0000 1.2
+++ DatatypeValidator.java 29 Jan 2002 01:00:30 -0000 1.3
@@ -60,7 +60,7 @@
import java.util.Hashtable;
/**
- * @version $Id: DatatypeValidator.java,v 1.2 2002/01/28 19:33:35 lehors Exp $
+ * @version $Id: DatatypeValidator.java,v 1.3 2002/01/29 01:00:30 twl Exp $
*/
public interface DatatypeValidator {
//
@@ -94,7 +94,7 @@
/**
* getFacets
*
- * @return
+ * @return a hashtable of the facet suported by the validator
*/
public Hashtable getFacets();
@@ -113,7 +113,8 @@
* @param value1
* @param value2
*
- * @return
+ * @return 0 if value1 and value2 are equal, a value less than 0 if value1 is less than value2,
+ * a value greater than 0 if value1 is greater than value2
*/
public int compare(String value1, String value2)
throws InvalidDatatypeValueException;
1.4 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java
Index: ENTITYDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/ENTITYDatatypeValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ENTITYDatatypeValidator.java 17 Jan 2002 17:59:34 -0000 1.3
+++ ENTITYDatatypeValidator.java 29 Jan 2002 01:00:30 -0000 1.4
@@ -85,7 +85,7 @@
* able to validate entities.</P>
*
* @author Jeffrey Rodriguez-
- * @version $Id: ENTITYDatatypeValidator.java,v 1.3 2002/01/17 17:59:34 neilg Exp $
+ * @version $Id: ENTITYDatatypeValidator.java,v 1.4 2002/01/29 01:00:30 twl Exp $
* @see org.apache.xerces.impl.dtd.AbstractDTDGrammar
* @see org.apache.xerces.impl.dtd.DTDGrammar
* @see org.apache.xerces.impl.xs.SchemaGrammar
@@ -176,7 +176,7 @@
* REVISIT
* Compares two Datatype for order
*
- * @return
+ * @return 0 if value1 and value2 are equal, a value less than 0 if value1 is less than value2, a value greater than 0 if value1 is greater than value2
*/
public int compare( String content1, String content2) {
return -1;
1.3 +3 -4 xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java
Index: IDDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/IDDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IDDatatypeValidator.java 10 Jan 2002 06:34:22 -0000 1.2
+++ IDDatatypeValidator.java 29 Jan 2002 01:00:30 -0000 1.3
@@ -121,7 +121,7 @@
* </CODE>
*
* @author Jeffrey Rodriguez
- * @version $Id: IDDatatypeValidator.java,v 1.2 2002/01/10 06:34:22 twl Exp $
+ * @version $Id: IDDatatypeValidator.java,v 1.3 2002/01/29 01:00:30 twl Exp $
* @see AbstractDatatypeValidator
* @see DatatypeValidator
* @see IDREFDatatypeValidator
@@ -154,7 +154,6 @@
* @param content A string containing the content to be validated
* @param state Generic Object state that can be use to pass
* Structures
- * @return
* @exception throws InvalidDatatypeException if the content is
* invalid according to the rules for the validators
* @exception InvalidDatatypeValueException
@@ -202,7 +201,7 @@
*
* @param o1
* @param o2
- * @return
+ * @return 0 if value1 and value2 are equal, a value less than 0 if value1 is less than value2, a value greater than 0 if value1 is greater than value2
*/
public int compare( String content1, String content2) {
return -1;
@@ -225,7 +224,7 @@
* This method should be used by the IDREF datatype
* validator which needs read access to ID table.
*
- * @return
+ * @return internal state of the validator (in this case the ID table)
*/
public Object getInternalStateInformation() {
return fTableOfId;
1.3 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java
Index: IDREFDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/IDREFDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IDREFDatatypeValidator.java 10 Jan 2002 06:34:22 -0000 1.2
+++ IDREFDatatypeValidator.java 29 Jan 2002 01:00:30 -0000 1.3
@@ -99,7 +99,7 @@
* </CODE>
*
* @author Jeffrey Rodriguez-
- * @version $Id: IDREFDatatypeValidator.java,v 1.2 2002/01/10 06:34:22 twl Exp $
+ * @version $Id: IDREFDatatypeValidator.java,v 1.3 2002/01/29 01:00:30 twl Exp $
* @see IDDatatypeValidator
* @see DatatypeValidator
* @see DatatypeValidator
@@ -207,7 +207,7 @@
*
* @param o1
* @param o2
- * @return
+ * @return 0 if value1 and value2 are equal, a value less than 0 if value1 is less than value2, a value greater than 0 if value1 is greater than value2
*/
public int compare( String content1, String content2){
return -1;
1.3 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java
Index: NOTATIONDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/dtd/NOTATIONDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOTATIONDatatypeValidator.java 10 Jan 2002 06:34:22 -0000 1.2
+++ NOTATIONDatatypeValidator.java 29 Jan 2002 01:00:30 -0000 1.3
@@ -72,7 +72,7 @@
* standalone code as well as plugins to the validator architecture.
*
* @author Jeffrey Rodriguez-
- * @version $Id: NOTATIONDatatypeValidator.java,v 1.2 2002/01/10 06:34:22 twl Exp $
+ * @version $Id: NOTATIONDatatypeValidator.java,v 1.3 2002/01/29 01:00:30 twl Exp $
*/
public class NOTATIONDatatypeValidator extends AbstractDatatypeValidator {
private DatatypeValidator fBaseValidator = null;
@@ -124,7 +124,7 @@
*
* @param o1
* @param o2
- * @return
+ * @return 0 if value1 and value2 are equal, a value less than 0 if value1 is less than value2, a value greater than 0 if value1 is greater than value2
*/
public int compare( String content1, String content2){
return -1;
1.2 +10 -15 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java
Index: AbstractDateTimeDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDateTimeDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ AbstractDateTimeDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -74,7 +74,7 @@
* @author Len Berman
* @author Gopal Sharma, SUN Microsystems Inc.
*
- * @version $Id: AbstractDateTimeDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: AbstractDateTimeDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public abstract class AbstractDateTimeDV extends TypeValidator {
@@ -164,7 +164,7 @@
* If null - new object will be created, otherwise
* date will be reset and reused
* @return updated date/time object
- * @exception Exception
+ * @exception SchemaDateTimeException
*/
abstract protected int[] parse (String content, int[] date) throws SchemaDateTimeException;
@@ -256,7 +256,7 @@
*
* @param date1 date/time object
* @param date2 date/time object
- * @return
+ * @return 0 if date1 and date2 are equal, a value less than 0 if date1 is less than date2, a value greater than 0 if date1 is greater than date2
*/
protected short compareOrder (int[] date1, int[] date2) {
@@ -277,8 +277,7 @@
* @param start
* @param end
* @param data
- * @return
- * @exception Exception
+ * @exception RuntimeException
*/
protected void getTime (int start, int end, int[] data) throws RuntimeException{
@@ -338,8 +337,7 @@
* @param start
* @param end
* @param data
- * @return
- * @exception Exception
+ * @exception RuntimeException
*/
protected void getDate (int start, int end, int[] date) throws RuntimeException{
@@ -359,8 +357,7 @@
* @param start
* @param end
* @param data
- * @return
- * @exception Exception
+ * @exception RuntimeException
*/
protected void getYearMonth (int start, int end, int[] date) throws RuntimeException{
@@ -395,8 +392,7 @@
*
* @param end
* @param date
- * @return
- * @exception Exception
+ * @exception RuntimeException
*/
protected void parseTimeZone (int end, int[] date) throws RuntimeException{
@@ -418,7 +414,7 @@
*
* @param data
* @param sign
- * @return
+ * @exception RuntimeException
*/
protected void getTimeZone (int[] data, int sign) throws RuntimeException{
data[utc]=fBuffer.charAt(sign);
@@ -476,7 +472,6 @@
* [D.1 ISO 8601 Conventions]
*
* @param data
- * @return
*/
protected void validateDateTime (int[] data) {
@@ -529,7 +524,7 @@
*
* @param start
* @param end
- * @return
+ * @return index of the UTC character that was found
*/
protected int findUTCSign (int start, int end) {
int c;
@@ -703,7 +698,7 @@
*
* @param year
* @param month
- * @return
+ * @return integer containg the number of days in a given month
*/
protected int maxDayInMonthFor(int year, int month) {
//validate days
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateDV.java
Index: DateDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ DateDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @Gopal Sharma, SUN Microsystems Inc.
*
- * @version $Id: DateDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: DateDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class DateDV extends DateTimeDV {
@@ -85,7 +85,7 @@
* with possible time zone Z or (-),(+)hh:mm
* @param date uninitialized date object
* @return normalized dateTime representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
resetBuffer(str);
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java
Index: DateTimeDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateTimeDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ DateTimeDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
*
- * @version $Id: DateTimeDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: DateTimeDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class DateTimeDV extends AbstractDateTimeDV {
@@ -85,7 +85,7 @@
* with possible time zone Z or (-),(+)hh:mm
* @param date uninitialized date object
* @return normalized dateTime representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException {
resetBuffer(str);
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DayDV.java
Index: DayDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DayDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DayDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ DayDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -65,7 +65,7 @@
*
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
- * @version $Id: DayDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: DayDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class DayDV extends AbstractDateTimeDV {
@@ -88,7 +88,7 @@
* Pattern: ---(\\d\\d)(Z|(([-+])(\\d\\d)(:(\\d\\d))?
* @param date uninitialized date object
* @return normalized date representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException {
1.2 +8 -3 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DurationDV.java
Index: DurationDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DurationDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DurationDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ DurationDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -65,7 +65,7 @@
*
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
- * @version $Id: DurationDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: DurationDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class DurationDV extends AbstractDateTimeDV {
@@ -97,7 +97,7 @@
* @param str The lexical representation of duration object PnYn MnDTnH nMnS
* @param date uninitialized date object
* @return normalized date representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
@@ -220,7 +220,12 @@
* @param date2 Unnormalized duration
* @param strict (min/max)Exclusive strict == true ( LESS_THAN ) or ( GREATER_THAN )
* (min/max)Inclusive strict == false (LESS_EQUAL) or (GREATER_EQUAL)
- * @return
+ * @return INDETERMINATE if the order relationship between date1 and date2 is indeterminate.
+ * EQUAL if the order relation between date1 and date2 is EQUAL.
+ * If the strict parameter is true, return LESS_THAN if date1 is less than date2 and
+ * return GREATER_THAN if date1 is greater than date2.
+ * If the strict parameter is false, return LESS_THAN if date1 is less than OR equal to date2 and
+ * return GREATER_THAN if date1 is greater than OR equal to date2
*/
protected short compareDates(int[] date1, int[] date2, boolean strict) {
1.2 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDV.java
Index: MonthDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonthDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ MonthDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
*
- * @version $Id: MonthDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: MonthDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class MonthDV extends AbstractDateTimeDV {
@@ -92,7 +92,7 @@
* with possible time zone Z or (-),(+)hh:mm
* @param date uninitialized date object
* @return normalized date representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
@@ -145,7 +145,7 @@
*
* @param date1
* @param date2
- * @return
+ * @return less, greater, equal, indeterminate
*/
protected short compareDates(int[] date1, int[] date2) {
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java
Index: MonthDayDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MonthDayDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ MonthDayDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
*
- * @version $Id: MonthDayDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: MonthDayDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class MonthDayDV extends AbstractDateTimeDV {
@@ -95,7 +95,7 @@
* with possible time zone Z or (-),(+)hh:mm
* @param date uninitialized date object
* @return normalized date representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/TimeDV.java
Index: TimeDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/TimeDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeDV.java 24 Jan 2002 16:38:27 -0000 1.1
+++ TimeDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
*
- * @version $Id: TimeDV.java,v 1.1 2002/01/24 16:38:27 sandygao Exp $
+ * @version $Id: TimeDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class TimeDV extends AbstractDateTimeDV {
@@ -92,7 +92,7 @@
* Pattern: "(\\d\\d):(\\d\\d):(\\d\\d)(\\.(\\d)*)?(Z|(([-+])(\\d\\d)(:(\\d\\d))?))?")
* @param date uninitialized date object
* @return normalized time representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearDV.java
Index: YearDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- YearDV.java 24 Jan 2002 16:38:28 -0000 1.1
+++ YearDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
*
- * @version $Id: YearDV.java,v 1.1 2002/01/24 16:38:28 sandygao Exp $
+ * @version $Id: YearDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class YearDV extends AbstractDateTimeDV {
@@ -92,7 +92,7 @@
* with possible time zone Z or (-),(+)hh:mm
* @param date uninitialized date object
* @return normalized date representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
resetBuffer(str);
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java
Index: YearMonthDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- YearMonthDV.java 24 Jan 2002 16:38:28 -0000 1.1
+++ YearMonthDV.java 29 Jan 2002 01:00:30 -0000 1.2
@@ -66,7 +66,7 @@
* @author Elena Litani
* @author Gopal Sharma, SUN Microsystem Inc.
*
- * @version $Id: YearMonthDV.java,v 1.1 2002/01/24 16:38:28 sandygao Exp $
+ * @version $Id: YearMonthDV.java,v 1.2 2002/01/29 01:00:30 twl Exp $
*/
public class YearMonthDV extends AbstractDateTimeDV{
@@ -91,7 +91,7 @@
* with possible time zone Z or (-),(+)hh:mm
* @param date uninitialized date object
* @return normalized date representation
- * @exception Exception Invalid lexical representation
+ * @exception SchemaDateTimeException Invalid lexical representation
*/
protected int[] parse(String str, int[] date) throws SchemaDateTimeException{
resetBuffer(str);
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/validation/EntityState.java
Index: EntityState.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/EntityState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityState.java 16 Oct 2001 15:11:38 -0000 1.1
+++ EntityState.java 29 Jan 2002 01:00:31 -0000 1.2
@@ -70,7 +70,7 @@
* Query method to check if entity with this name was declared.
*
* @param name
- * @return
+ * @return true if name is a declared entity
*/
public boolean isEntityDeclared (String name);
@@ -78,7 +78,7 @@
* Query method to check if entity is unparsed.
*
* @param name
- * @return
+ * @return true if name is an unparsed entity
*/
public boolean isEntityUnparsed (String name);
}
1.2 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Selector.java
Index: Selector.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Selector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Selector.java 25 Oct 2001 20:36:03 -0000 1.1
+++ Selector.java 29 Jan 2002 01:00:31 -0000 1.2
@@ -73,7 +73,7 @@
* Schema identity constraint selector.
*
* @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.1 2001/10/25 20:36:03 elena Exp $
+ * @version $Id: Selector.java,v 1.2 2002/01/29 01:00:31 twl Exp $
*/
public class Selector {
@@ -136,7 +136,7 @@
* Schema identity constraint selector XPath expression.
*
* @author Andy Clark, IBM
- * @version $Id: Selector.java,v 1.1 2001/10/25 20:36:03 elena Exp $
+ * @version $Id: Selector.java,v 1.2 2002/01/29 01:00:31 twl Exp $
*/
public static class XPath
extends org.apache.xerces.impl.xpath.XPath {
@@ -222,7 +222,7 @@
* @param attributes The element attributes.
* @param elementDecl: The element declaration
*
- * @throws SAXException Thrown by handler to signal an error.
+ * @throws XNIException Thrown by handler to signal an error.
*/
public void startElement(QName element, XMLAttributes attributes,
XSElementDecl elementDecl) throws XNIException {
1.34 +8 -1 xml-xerces/java/src/org/apache/xerces/parsers/AbstractDOMParser.java
Index: AbstractDOMParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/AbstractDOMParser.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- AbstractDOMParser.java 28 Jan 2002 19:46:33 -0000 1.33
+++ AbstractDOMParser.java 29 Jan 2002 01:00:31 -0000 1.34
@@ -105,7 +105,7 @@
* @author Andy Clark, IBM
* @author Elena Litani, IBM
*
- * @version $Id: AbstractDOMParser.java,v 1.33 2002/01/28 19:46:33 elena Exp $
+ * @version $Id: AbstractDOMParser.java,v 1.34 2002/01/29 01:00:31 twl Exp $
*/
public abstract class AbstractDOMParser
extends AbstractXMLDocumentParser {
@@ -271,6 +271,13 @@
DEFAULT_DOCUMENT_CLASS_NAME);
} // <init>(XMLParserConfiguration)
+
+ /**
+ * This method retreives the name of current document class.
+ */
+ protected String getDocumentClassName() {
+ return documentClassName;
+ }
/**
* This method allows the programmer to decide which document
1.8 +2 -2 xml-xerces/java/src/org/apache/xerces/parsers/DTDParser.java
Index: DTDParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DTDParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DTDParser.java 28 Jan 2002 19:33:35 -0000 1.7
+++ DTDParser.java 29 Jan 2002 01:00:31 -0000 1.8
@@ -67,7 +67,7 @@
import org.apache.xerces.xni.parser.XMLDTDScanner;
/**
- * @version $Id: DTDParser.java,v 1.7 2002/01/28 19:33:35 lehors Exp $
+ * @version $Id: DTDParser.java,v 1.8 2002/01/29 01:00:31 twl Exp $
*/
public abstract class DTDParser
extends XMLGrammarParser
@@ -100,7 +100,7 @@
/**
* getDTDGrammar
*
- * @return
+ * @return the grammar created by this parser
*/
public DTDGrammar getDTDGrammar() {
return null;
1.7 +1 -3 xml-xerces/java/src/org/apache/xerces/util/NamespaceSupport.java
Index: NamespaceSupport.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/NamespaceSupport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NamespaceSupport.java 12 Jan 2002 00:10:51 -0000 1.6
+++ NamespaceSupport.java 29 Jan 2002 01:00:31 -0000 1.7
@@ -67,7 +67,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: NamespaceSupport.java,v 1.6 2002/01/12 00:10:51 elena Exp $
+ * @version $Id: NamespaceSupport.java,v 1.7 2002/01/29 01:00:31 twl Exp $
*/
public class NamespaceSupport
implements NamespaceContext {
@@ -318,7 +318,6 @@
* does not map to any prefix.
*
* @see #getPrefix
- * @see #getPrefixes
*/
public String getPrefix(String uri) {
@@ -424,7 +423,6 @@
* is undeclared in this context.
*
* @see #getPrefix
- * @see #getPrefixes
*/
public String getURI(String prefix) {
1.4 +2 -2 xml-xerces/java/src/org/apache/xerces/xni/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/xni/QName.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QName.java 28 Jan 2002 19:22:51 -0000 1.3
+++ QName.java 29 Jan 2002 01:00:32 -0000 1.4
@@ -65,11 +65,11 @@
* equal strings. Within the parser, these values are considered symbols
* and should always be retrieved from the <code>SymbolTable</code>.
*
- * @see org.apache.xerces.util.SymbolTable
+ * @see <a href="../../../../../xerces2/org/apache/xerces/util/SymbolTable.html">org.apache.xerces.util.SymbolTable</a>
*
* @author Andy Clark, IBM
*
- * @version $Id: QName.java,v 1.3 2002/01/28 19:22:51 lehors Exp $
+ * @version $Id: QName.java,v 1.4 2002/01/29 01:00:32 twl Exp $
*/
public class QName
implements Cloneable {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org