Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.
* sources.am: Regenerated.
* gcj/javaprims.h: Regenerated.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
* gnu/java/lang/VMInstrumentationImpl.java: New override.
* gnu/java/net/local/LocalSocketImpl.java: Likewise.
* gnu/classpath/jdwp/VMMethod.java: Likewise.
* gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
interface.
* java/lang/Thread.java: Add UncaughtExceptionHandler.
* java/lang/reflect/Method.java: Implements GenericDeclaration and
isSynthetic(),
* java/lang/reflect/Field.java: Likewise.
* java/lang/reflect/Constructor.java
* java/lang/Class.java: Implements Type, GenericDeclaration,
getSimpleName() and getEnclosing*() methods.
* java/lang/Class.h: Add new public methods.
* java/lang/Math.java: Add signum(), ulp() and log10().
* java/lang/natMath.cc (log10): New function.
* java/security/VMSecureRandom.java: New override.
* java/util/logging/Logger.java: Updated to latest classpath
version.
* java/util/logging/LogManager.java: New override.
From-SVN: r113887
This commit is contained in:
@@ -149,6 +149,14 @@ public class DomDocument
|
||||
checkingWellformedness = flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets whether to check for document characters.
|
||||
*/
|
||||
public void setCheckingCharacters(boolean flag)
|
||||
{
|
||||
checkingCharacters = flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>DOM L1</b>
|
||||
* Returns the constant "#document".
|
||||
@@ -235,6 +243,18 @@ public class DomDocument
|
||||
if (current.getNodeType() == ELEMENT_NODE)
|
||||
{
|
||||
DomElement element = (DomElement) current;
|
||||
if (element.userIdAttrs != null)
|
||||
{
|
||||
for (Iterator i = element.userIdAttrs.iterator();
|
||||
i.hasNext(); )
|
||||
{
|
||||
Node idAttr = (Node) i.next();
|
||||
if (id.equals(idAttr.getNodeValue()))
|
||||
{
|
||||
return element;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (doctype != null)
|
||||
{
|
||||
DTDElementTypeInfo info =
|
||||
@@ -244,18 +264,6 @@ public class DomDocument
|
||||
{
|
||||
return element;
|
||||
}
|
||||
else if (element.userIdAttrs != null)
|
||||
{
|
||||
for (Iterator i = element.userIdAttrs.iterator();
|
||||
i.hasNext(); )
|
||||
{
|
||||
Node idAttr = (Node) i.next();
|
||||
if (id.equals(idAttr.getNodeValue()))
|
||||
{
|
||||
return element;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// xml:id
|
||||
String xmlId = element.getAttribute("xml:id");
|
||||
@@ -535,11 +543,9 @@ public class DomDocument
|
||||
int index = name.indexOf(':');
|
||||
if (index != -1)
|
||||
{
|
||||
if (index == 0 || index == (len - 1) ||
|
||||
name.lastIndexOf(':') != index)
|
||||
if (index == 0 || index == (len - 1) || name.lastIndexOf(':') != index)
|
||||
{
|
||||
throw new DomDOMException(DOMException.NAMESPACE_ERR,
|
||||
name, null, 0);
|
||||
throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user