Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* XMLEventAllocatorImpl.java --
|
||||
Copyright (C) 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 2005,2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -116,10 +116,9 @@ public class XMLEventAllocatorImpl
|
||||
namespaces);
|
||||
case XMLStreamConstants.ENTITY_REFERENCE:
|
||||
String name = reader.getLocalName();
|
||||
//EntityDeclaration decl =
|
||||
// (EntityDeclaration) entityDeclarations.get(name);
|
||||
//return new EntityReferenceImpl(location, decl, name);
|
||||
return new EntityReferenceImpl(location, name, null, null, null, null);
|
||||
EntityDeclaration decl =
|
||||
(EntityDeclaration) entityDeclarations.get(name);
|
||||
return new EntityReferenceImpl(location, decl, name);
|
||||
case XMLStreamConstants.PROCESSING_INSTRUCTION:
|
||||
return new ProcessingInstructionImpl(location,
|
||||
reader.getPITarget(),
|
||||
@@ -132,7 +131,7 @@ public class XMLEventAllocatorImpl
|
||||
return new CharactersImpl(location, text,
|
||||
whitespace, false, ignorableWhitespace);
|
||||
case XMLStreamConstants.START_DOCUMENT:
|
||||
String systemId = location.getLocationURI();
|
||||
String systemId = location.getSystemId();
|
||||
String encoding = reader.getCharacterEncodingScheme();
|
||||
boolean encodingDeclared = encoding != null;
|
||||
if (encoding == null)
|
||||
@@ -164,7 +163,7 @@ public class XMLEventAllocatorImpl
|
||||
List attributes = new LinkedList();
|
||||
for (int i = 0; i < len; i++)
|
||||
attributes.add(new AttributeImpl(location,
|
||||
reader.getAttributeQName(i),
|
||||
reader.getAttributeName(i),
|
||||
reader.getAttributeValue(i),
|
||||
QName.valueOf(reader.getAttributeType(i)),
|
||||
reader.isAttributeSpecified(i)));
|
||||
|
||||
Reference in New Issue
Block a user