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:
@@ -67,7 +67,7 @@ public class XMLEventReaderImpl
|
||||
this.systemId = systemId;
|
||||
}
|
||||
|
||||
public XMLEvent next()
|
||||
public XMLEvent nextEvent()
|
||||
throws XMLStreamException
|
||||
{
|
||||
XMLEvent ret = peek();
|
||||
@@ -75,10 +75,32 @@ public class XMLEventReaderImpl
|
||||
return ret;
|
||||
}
|
||||
|
||||
public boolean hasNext()
|
||||
throws XMLStreamException
|
||||
public Object next()
|
||||
{
|
||||
return peekEvent != null || reader.hasNext();
|
||||
try
|
||||
{
|
||||
return nextEvent();
|
||||
}
|
||||
catch (XMLStreamException e)
|
||||
{
|
||||
RuntimeException e2 = new RuntimeException();
|
||||
e2.initCause(e);
|
||||
throw e2;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean hasNext()
|
||||
{
|
||||
if (peekEvent != null)
|
||||
return true;
|
||||
try
|
||||
{
|
||||
return reader.hasNext();
|
||||
}
|
||||
catch (XMLStreamException e)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public XMLEvent peek()
|
||||
@@ -121,5 +143,16 @@ public class XMLEventReaderImpl
|
||||
return reader.getProperty(name);
|
||||
}
|
||||
|
||||
public void close()
|
||||
throws XMLStreamException
|
||||
{
|
||||
reader.close();
|
||||
}
|
||||
|
||||
public void remove()
|
||||
{
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user