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 @@
|
||||
/* CopyNode.java --
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 2004,2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -65,13 +65,9 @@ final class CopyNode
|
||||
{
|
||||
TemplateNode ret = new CopyNode(uas);
|
||||
if (children != null)
|
||||
{
|
||||
ret.children = children.clone(stylesheet);
|
||||
}
|
||||
ret.children = children.clone(stylesheet);
|
||||
if (next != null)
|
||||
{
|
||||
ret.next = next.clone(stylesheet);
|
||||
}
|
||||
ret.next = next.clone(stylesheet);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -102,44 +98,32 @@ final class CopyNode
|
||||
{
|
||||
NamedNodeMap attrs = parent.getAttributes();
|
||||
if (attrs != null)
|
||||
{
|
||||
attrs.setNamedItemNS(copy);
|
||||
}
|
||||
attrs.setNamedItemNS(copy);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (nextSibling != null)
|
||||
{
|
||||
parent.insertBefore(copy, nextSibling);
|
||||
}
|
||||
parent.insertBefore(copy, nextSibling);
|
||||
else
|
||||
{
|
||||
parent.appendChild(copy);
|
||||
}
|
||||
parent.appendChild(copy);
|
||||
}
|
||||
}
|
||||
if (uas != null)
|
||||
{
|
||||
StringTokenizer st = new StringTokenizer(uas, " ");
|
||||
while (st.hasMoreTokens())
|
||||
{
|
||||
addAttributeSet(stylesheet, mode, context, pos, len,
|
||||
copy, null, st.nextToken());
|
||||
}
|
||||
addAttributeSet(stylesheet, mode, context, pos, len,
|
||||
copy, null, st.nextToken());
|
||||
}
|
||||
if (children != null)
|
||||
{
|
||||
children.apply(stylesheet, mode,
|
||||
context, pos, len,
|
||||
copy, null);
|
||||
}
|
||||
children.apply(stylesheet, mode,
|
||||
context, pos, len,
|
||||
copy, null);
|
||||
if (next != null)
|
||||
{
|
||||
next.apply(stylesheet, mode,
|
||||
context, pos, len,
|
||||
parent, nextSibling);
|
||||
}
|
||||
next.apply(stylesheet, mode,
|
||||
context, pos, len,
|
||||
parent, nextSibling);
|
||||
}
|
||||
|
||||
void addAttributeSet(Stylesheet stylesheet, QName mode,
|
||||
@@ -151,32 +135,31 @@ final class CopyNode
|
||||
{
|
||||
AttributeSet as = (AttributeSet) i.next();
|
||||
if (!as.name.equals(attributeSet))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
if (as.uas != null)
|
||||
{
|
||||
StringTokenizer st = new StringTokenizer(as.uas, " ");
|
||||
while (st.hasMoreTokens())
|
||||
{
|
||||
addAttributeSet(stylesheet, mode, context, pos, len,
|
||||
parent, nextSibling, st.nextToken());
|
||||
}
|
||||
addAttributeSet(stylesheet, mode, context, pos, len,
|
||||
parent, nextSibling, st.nextToken());
|
||||
}
|
||||
if (as.children != null)
|
||||
{
|
||||
as.children.apply(stylesheet, mode,
|
||||
context, pos, len,
|
||||
parent, nextSibling);
|
||||
}
|
||||
as.children.apply(stylesheet, mode,
|
||||
context, pos, len,
|
||||
parent, nextSibling);
|
||||
}
|
||||
}
|
||||
|
||||
public String toString()
|
||||
{
|
||||
StringBuffer buf = new StringBuffer(getClass().getName());
|
||||
buf.append('[');
|
||||
buf.append(']');
|
||||
StringBuffer buf = new StringBuffer("copy");
|
||||
if (uas != null)
|
||||
{
|
||||
buf.append('[');
|
||||
buf.append("uas=");
|
||||
buf.append(uas);
|
||||
buf.append(']');
|
||||
}
|
||||
return buf.toString();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user