/[classpath]/classpath/external/jaxp/source/gnu/xml/aelfred2/XmlParser.java
ViewVC logotype

Diff of /classpath/external/jaxp/source/gnu/xml/aelfred2/XmlParser.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by mark, Sat May 1 16:18:49 2004 UTC revision 1.2.2.1 by tromey, Sun Aug 8 06:38:26 2004 UTC
# Line 1500  loop: Line 1500  loop:
1500      {      {
1501          String name;          String name;
1502          String type;          String type;
1503          String enum = null;          String enum_val = null;
1504    
1505          // Read the attribute name.          // Read the attribute name.
1506          name = readNmtoken (true);          name = readNmtoken (true);
# Line 1511  loop: Line 1511  loop:
1511    
1512          // Get the string of enumerated values if necessary.          // Get the string of enumerated values if necessary.
1513          if ("ENUMERATION" == type || "NOTATION" == type)          if ("ENUMERATION" == type || "NOTATION" == type)
1514              enum = dataBufferToString ();              enum_val = dataBufferToString ();
1515    
1516          // Read the default value.          // Read the default value.
1517          requireWhitespace ();          requireWhitespace ();
1518          parseDefault (elementName, name, type, enum);          parseDefault (elementName, name, type, enum_val);
1519      }      }
1520    
1521    
# Line 1612  loop: Line 1612  loop:
1612          String elementName,          String elementName,
1613          String name,          String name,
1614          String type,          String type,
1615          String enum          String enum_val
1616      ) throws Exception      ) throws Exception
1617      {      {
1618          int     valueType = ATTRIBUTE_DEFAULT_SPECIFIED;          int     valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
# Line 1650  loop: Line 1650  loop:
1650          } else          } else
1651              value = readLiteral (flags);              value = readLiteral (flags);
1652          expandPE = saved;          expandPE = saved;
1653          setAttribute (elementName, name, type, enum, value, valueType);          setAttribute (elementName, name, type, enum_val, value, valueType);
1654          if ("ENUMERATION" == type)          if ("ENUMERATION" == type)
1655              type = enum;              type = enum_val;
1656          else if ("NOTATION" == type)          else if ("NOTATION" == type)
1657              type = "NOTATION " + enum;              type = "NOTATION " + enum_val;
1658          if (!skippedPE) handler.getDeclHandler ()          if (!skippedPE) handler.getDeclHandler ()
1659              .attributeDecl (elementName, name, type, defaultType, value);              .attributeDecl (elementName, name, type, defaultType, value);
1660      }      }

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.2.2.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26