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 @@
|
||||
/* XMLInputFactoryImpl.java --
|
||||
Copyright (C) 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 2005,2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -89,28 +89,7 @@ public class XMLInputFactoryImpl
|
||||
public XMLStreamReader createXMLStreamReader(Reader reader)
|
||||
throws XMLStreamException
|
||||
{
|
||||
/*
|
||||
return new XMLStreamReaderImpl(reader, null, null,
|
||||
resolver, reporter,
|
||||
validating, namespaceAware,
|
||||
coalescing, replacingEntityReferences,
|
||||
externalEntities, supportDTD);
|
||||
*/
|
||||
XMLParser ret = new XMLParser(reader, null,
|
||||
validating,
|
||||
namespaceAware,
|
||||
coalescing,
|
||||
replacingEntityReferences,
|
||||
externalEntities,
|
||||
supportDTD,
|
||||
baseAware,
|
||||
stringInterning,
|
||||
reporter,
|
||||
resolver);
|
||||
if (xIncludeAware)
|
||||
return new XIncludeFilter(ret, null, namespaceAware, validating,
|
||||
replacingEntityReferences);
|
||||
return ret;
|
||||
return createXMLStreamReader(null, reader);
|
||||
}
|
||||
|
||||
public XMLStreamReader createXMLStreamReader(Source source)
|
||||
@@ -118,11 +97,6 @@ public class XMLInputFactoryImpl
|
||||
{
|
||||
String systemId = source.getSystemId();
|
||||
InputStream in = getInputStream(source);
|
||||
/*return new XMLStreamReaderImpl(in, null, systemId,
|
||||
resolver, reporter,
|
||||
validating, namespaceAware,
|
||||
coalescing, replacingEntityReferences,
|
||||
externalEntities, supportDTD);*/
|
||||
XMLParser ret = new XMLParser(in, systemId,
|
||||
validating,
|
||||
namespaceAware,
|
||||
@@ -132,6 +106,7 @@ public class XMLInputFactoryImpl
|
||||
supportDTD,
|
||||
baseAware,
|
||||
stringInterning,
|
||||
false,
|
||||
reporter,
|
||||
resolver);
|
||||
if (xIncludeAware)
|
||||
@@ -143,26 +118,7 @@ public class XMLInputFactoryImpl
|
||||
public XMLStreamReader createXMLStreamReader(InputStream in)
|
||||
throws XMLStreamException
|
||||
{
|
||||
/*return new XMLStreamReaderImpl(in, null, null,
|
||||
resolver, reporter,
|
||||
validating, namespaceAware,
|
||||
coalescing, replacingEntityReferences,
|
||||
externalEntities, supportDTD);*/
|
||||
XMLParser ret = new XMLParser(in, null,
|
||||
validating,
|
||||
namespaceAware,
|
||||
coalescing,
|
||||
replacingEntityReferences,
|
||||
externalEntities,
|
||||
supportDTD,
|
||||
baseAware,
|
||||
stringInterning,
|
||||
reporter,
|
||||
resolver);
|
||||
if (xIncludeAware)
|
||||
return new XIncludeFilter(ret, null, namespaceAware, validating,
|
||||
replacingEntityReferences);
|
||||
return ret;
|
||||
return createXMLStreamReader(null, in);
|
||||
}
|
||||
|
||||
public XMLStreamReader createXMLStreamReader(InputStream in, String encoding)
|
||||
@@ -171,6 +127,48 @@ public class XMLInputFactoryImpl
|
||||
return createXMLStreamReader(in);
|
||||
}
|
||||
|
||||
public XMLStreamReader createXMLStreamReader(String systemId, InputStream in)
|
||||
throws XMLStreamException
|
||||
{
|
||||
XMLParser ret = new XMLParser(in, systemId,
|
||||
validating,
|
||||
namespaceAware,
|
||||
coalescing,
|
||||
replacingEntityReferences,
|
||||
externalEntities,
|
||||
supportDTD,
|
||||
baseAware,
|
||||
stringInterning,
|
||||
false,
|
||||
reporter,
|
||||
resolver);
|
||||
if (xIncludeAware)
|
||||
return new XIncludeFilter(ret, null, namespaceAware, validating,
|
||||
replacingEntityReferences);
|
||||
return ret;
|
||||
}
|
||||
|
||||
public XMLStreamReader createXMLStreamReader(String systemId, Reader reader)
|
||||
throws XMLStreamException
|
||||
{
|
||||
XMLParser ret = new XMLParser(reader, systemId,
|
||||
validating,
|
||||
namespaceAware,
|
||||
coalescing,
|
||||
replacingEntityReferences,
|
||||
externalEntities,
|
||||
supportDTD,
|
||||
baseAware,
|
||||
stringInterning,
|
||||
false,
|
||||
reporter,
|
||||
resolver);
|
||||
if (xIncludeAware)
|
||||
return new XIncludeFilter(ret, null, namespaceAware, validating,
|
||||
replacingEntityReferences);
|
||||
return ret;
|
||||
}
|
||||
|
||||
public XMLEventReader createXMLEventReader(Reader reader)
|
||||
throws XMLStreamException
|
||||
{
|
||||
@@ -178,6 +176,13 @@ public class XMLInputFactoryImpl
|
||||
return new XMLEventReaderImpl(sr, allocator, null);
|
||||
}
|
||||
|
||||
public XMLEventReader createXMLEventReader(String systemId, Reader reader)
|
||||
throws XMLStreamException
|
||||
{
|
||||
XMLStreamReader sr = createXMLStreamReader(systemId, reader);
|
||||
return new XMLEventReaderImpl(sr, allocator, null);
|
||||
}
|
||||
|
||||
public XMLEventReader createXMLEventReader(XMLStreamReader reader)
|
||||
throws XMLStreamException
|
||||
{
|
||||
@@ -205,6 +210,13 @@ public class XMLInputFactoryImpl
|
||||
return new XMLEventReaderImpl(sr, allocator, null);
|
||||
}
|
||||
|
||||
public XMLEventReader createXMLEventReader(String systemId, InputStream in)
|
||||
throws XMLStreamException
|
||||
{
|
||||
XMLStreamReader sr = createXMLStreamReader(systemId, in);
|
||||
return new XMLEventReaderImpl(sr, allocator, null);
|
||||
}
|
||||
|
||||
public XMLStreamReader createFilteredReader(XMLStreamReader reader,
|
||||
StreamFilter filter)
|
||||
throws XMLStreamException
|
||||
|
||||
Reference in New Issue
Block a user