cvs commit: xml-xerces/java/src/org/apache/xerces/parsers AbstractDOMParser.java

[venu]

venu        2003/11/03 21:15:16

  Modified:    java/src/org/apache/xerces/impl/dtd XMLDTDValidator.java
               java/src/org/apache/xerces/parsers AbstractDOMParser.java
  Log:
  Backed out changes
  
  Revision  Changes    Path
  1.53      +1 -2      
xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java
  
  Index: XMLDTDValidator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- XMLDTDValidator.java      3 Nov 2003 11:02:43 -0000       1.52
  +++ XMLDTDValidator.java      4 Nov 2003 05:15:16 -0000       1.53
  @@ -1289,7 +1289,6 @@
                                                  "MSG_ATTRIBUTE_NOT_DECLARED",
                                                  
args,XMLErrorReporter.SEVERITY_ERROR);   
                   }
  -                             attributes.setType(i, null);
                   continue;
               }
               // attribute is declared
  
  
  
  1.91      +3 -8      
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.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- AbstractDOMParser.java    3 Nov 2003 11:04:33 -0000       1.90
  +++ AbstractDOMParser.java    4 Nov 2003 05:15:16 -0000       1.91
  @@ -966,7 +966,7 @@
                                                // DTD 
                           type = attributes.getType(i);
                                                attrImpl.setType(type);
  -                                             id = isIDType((String)type);
  +                                             id = (type.equals("ID")) ? true : 
false;
                                        }
                   
                                        if (id) {
  @@ -1059,7 +1059,7 @@
                                else {
                                        // DTD 
                                        type = attributes.getType(i);
  -                                     id = isIDType((String)type);
  +                                     id = (type.equals("ID")) ? true : false;
                                }
                   
                   // create attribute
  @@ -2390,7 +2390,7 @@
                   }
                   attr.setValue(defaultValue.toString());
                   attr.setSpecified(false);
  -                attr.setIdAttribute(isIDType(type));
  +                attr.setIdAttribute(type.equals("ID"));
   
                   // add default attribute to element definition
                   if (nsEnabled){
  @@ -2550,10 +2550,5 @@
              throw new RuntimeException();
       }
   
  -     private boolean isIDType(String type) {
  -             if ( type == null )
  -                     return false;
  -             return (type.equals("ID")) ? true : false;
  -     }
       
   } // class AbstractDOMParser
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]