diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-29 17:50:59 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-29 17:50:59 +0000 |
| commit | fce8df1021b8e76afd5e8f909557826fcbf3ff19 (patch) | |
| tree | 3cfe7282cd5664c854b8f591c178d778224cc35e | |
| parent | d6d765b4a20ee056454dc87d9e002cd2f5ebb42d (diff) | |
| download | gcc-fce8df1021b8e76afd5e8f909557826fcbf3ff19.tar.gz | |
2009-06-29 Andrew Haley <aph@redhat.com>
PR java/40590
* tools/gnu/classpath/tools/javah/FieldHelper.java (print):
Use printName().
* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
Use printName().
* tools/gnu/classpath/tools/javah/CniStubPrinter.java (printDecl):
Use printName().
* tools/gnu/classpath/tools/javah/Keywords.java (words): Replace
with keywords list from gcc/java/mangle.c.
* tools/gnu/classpath/tools/javah/ClassWrapper.java (printMethods):
Don't pre-convert a C++ keyword.
(print(CniPrintStream)): Call CniPrintStream.printName().
(printContents): Likewise.
* tools/gnu/classpath/tools/javah/CniPrintStream.java
(getClassName): Don't call replaceAll("/", "::").
(print(Type)): Add ""::" befor name, " *" after. Use printName(), not
print.
(printName(PrintStream, String), printName(String), printlnName):
New methods.
(moveToPackage): Use printName().
2009-06-29 Andrew Haley <aph@redhat.com>
PR java/40590
* java-tree.h (cxx_keyword_p): New declaration.
* mangle_name.c (utf8_cmp): Move here from mangle.c.
(cxx_keywords): Likewise.
(cxx_keyword_p): Likewise.
(MANGLE_CXX_KEYWORDS): New macro.
(append_gpp_mangled_name): Use MANGLE_CXX_KEYWORDS.
(append_gpp_mangled_name): Likewise.
* mangle.c: Move code to mangle_name.c.
(mangle_member_name): Don't call cxx_keyword_p.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149059 138bc75d-0d04-0410-961f-82ee72b054a4
150 files changed, 765 insertions, 586 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b3daaa8e189..5e41e13b180 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,16 @@ +2009-06-29 Andrew Haley <aph@redhat.com> + + PR java/40590 + * java-tree.h (cxx_keyword_p): New declaration. + * mangle_name.c (utf8_cmp): Move here from mangle.c. + (cxx_keywords): Likewise. + (cxx_keyword_p): Likewise. + (MANGLE_CXX_KEYWORDS): New macro. + (append_gpp_mangled_name): Use MANGLE_CXX_KEYWORDS. + (append_gpp_mangled_name): Likewise. + * mangle.c: Move code to mangle_name.c. + (mangle_member_name): Don't call cxx_keyword_p. + 2009-06-12 Aldy Hernandez <aldyh@redhat.com> * java-gimplify.c (java_gimplify_block): New argument to diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 98352a2eaf2..6bf2ecd8217 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1224,6 +1224,8 @@ extern void java_read_sourcefilenames (const char *fsource_filename); extern void rewrite_reflection_indexes (void *); +int cxx_keyword_p (const char *name, int length); + #define DECL_FINAL(DECL) DECL_LANG_FLAG_3 (DECL) /* Access flags etc for a method (a FUNCTION_DECL): */ diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index 61594d9b5ed..4630f6d9da0 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -72,167 +72,6 @@ struct obstack *mangle_obstack; /* atms: array template mangled string. */ static GTY(()) tree atms; -static int -utf8_cmp (const unsigned char *str, int length, const char *name) -{ - const unsigned char *limit = str + length; - int i; - - for (i = 0; name[i]; ++i) - { - int ch = UTF8_GET (str, limit); - if (ch != name[i]) - return ch - name[i]; - } - - return str == limit ? 0 : 1; -} - -/* A sorted list of all C++ keywords. */ -static const char *const cxx_keywords[] = -{ - "_Complex", - "__alignof", - "__alignof__", - "__asm", - "__asm__", - "__attribute", - "__attribute__", - "__builtin_va_arg", - "__complex", - "__complex__", - "__const", - "__const__", - "__extension__", - "__imag", - "__imag__", - "__inline", - "__inline__", - "__label__", - "__null", - "__real", - "__real__", - "__restrict", - "__restrict__", - "__signed", - "__signed__", - "__typeof", - "__typeof__", - "__volatile", - "__volatile__", - "and", - "and_eq", - "asm", - "auto", - "bitand", - "bitor", - "bool", - "break", - "case", - "catch", - "char", - "class", - "compl", - "const", - "const_cast", - "continue", - "default", - "delete", - "do", - "double", - "dynamic_cast", - "else", - "enum", - "explicit", - "export", - "extern", - "false", - "float", - "for", - "friend", - "goto", - "if", - "inline", - "int", - "long", - "mutable", - "namespace", - "new", - "not", - "not_eq", - "operator", - "or", - "or_eq", - "private", - "protected", - "public", - "register", - "reinterpret_cast", - "return", - "short", - "signed", - "sizeof", - "static", - "static_cast", - "struct", - "switch", - "template", - "this", - "throw", - "true", - "try", - "typedef", - "typeid", - "typename", - "typeof", - "union", - "unsigned", - "using", - "virtual", - "void", - "volatile", - "wchar_t", - "while", - "xor", - "xor_eq" -}; - -/* Return true if NAME is a C++ keyword. */ -static int -cxx_keyword_p (const char *name, int length) -{ - int last = ARRAY_SIZE (cxx_keywords); - int first = 0; - int mid = (last + first) / 2; - int old = -1; - - for (mid = (last + first) / 2; - mid != old; - old = mid, mid = (last + first) / 2) - { - int kwl = strlen (cxx_keywords[mid]); - int min_length = kwl > length ? length : kwl; - int r = utf8_cmp ((const unsigned char *) name, min_length, cxx_keywords[mid]); - - if (r == 0) - { - int i; - /* We've found a match if all the remaining characters are `$'. */ - for (i = min_length; i < length && name[i] == '$'; ++i) - ; - if (i == length) - return 1; - r = 1; - } - - if (r < 0) - last = mid; - else - first = mid; - } - return 0; -} - /* This is the mangling interface: a decl, a class field (.class) and the vtable. */ @@ -392,10 +231,6 @@ mangle_member_name (tree name) { append_gpp_mangled_name (IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name)); - - /* If NAME happens to be a C++ keyword, add `$'. */ - if (cxx_keyword_p (IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name))) - obstack_1grow (mangle_obstack, '$'); } /* Append the mangled name of TYPE onto OBSTACK. */ diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c index b4d86776cf8..a0e6887a04e 100644 --- a/gcc/java/mangle_name.c +++ b/gcc/java/mangle_name.c @@ -41,6 +41,185 @@ static int unicode_mangling_length (const char *, int); extern struct obstack *mangle_obstack; +static int +utf8_cmp (const unsigned char *str, int length, const char *name) +{ + const unsigned char *limit = str + length; + int i; + + for (i = 0; name[i]; ++i) + { + int ch = UTF8_GET (str, limit); + if (ch != name[i]) + return ch - name[i]; + } + + return str == limit ? 0 : 1; +} + +/* A sorted list of all C++ keywords. If you change this, be sure + also to change the list in + libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java. */ +static const char *const cxx_keywords[] = +{ + "_Complex", + "__alignof", + "__alignof__", + "__asm", + "__asm__", + "__attribute", + "__attribute__", + "__builtin_va_arg", + "__complex", + "__complex__", + "__const", + "__const__", + "__extension__", + "__imag", + "__imag__", + "__inline", + "__inline__", + "__label__", + "__null", + "__real", + "__real__", + "__restrict", + "__restrict__", + "__signed", + "__signed__", + "__typeof", + "__typeof__", + "__volatile", + "__volatile__", + "and", + "and_eq", + "asm", + "auto", + "bitand", + "bitor", + "bool", + "break", + "case", + "catch", + "char", + "class", + "compl", + "const", + "const_cast", + "continue", + "default", + "delete", + "do", + "double", + "dynamic_cast", + "else", + "enum", + "explicit", + "export", + "extern", + "false", + "float", + "for", + "friend", + "goto", + "if", + "inline", + "int", + "long", + "mutable", + "namespace", + "new", + "not", + "not_eq", + "operator", + "or", + "or_eq", + "private", + "protected", + "public", + "register", + "reinterpret_cast", + "return", + "short", + "signed", + "sizeof", + "static", + "static_cast", + "struct", + "switch", + "template", + "this", + "throw", + "true", + "try", + "typedef", + "typeid", + "typename", + "typeof", + "union", + "unsigned", + "using", + "virtual", + "void", + "volatile", + "wchar_t", + "while", + "xor", + "xor_eq" +}; + +/* Return true if NAME is a C++ keyword. */ +int +cxx_keyword_p (const char *name, int length) +{ + int last = ARRAY_SIZE (cxx_keywords); + int first = 0; + int mid = (last + first) / 2; + int old = -1; + + for (mid = (last + first) / 2; + mid != old; + old = mid, mid = (last + first) / 2) + { + int kwl = strlen (cxx_keywords[mid]); + int min_length = kwl > length ? length : kwl; + int r = utf8_cmp ((const unsigned char *) name, min_length, cxx_keywords[mid]); + + if (r == 0) + { + int i; + /* We've found a match if all the remaining characters are `$'. */ + for (i = min_length; i < length && name[i] == '$'; ++i) + ; + if (i == length) + return 1; + r = 1; + } + + if (r < 0) + last = mid; + else + first = mid; + } + return 0; +} + +/* If NAME happens to be a C++ keyword, add `$'. */ +#define MANGLE_CXX_KEYWORDS(NAME, LEN) \ +do \ + { \ + if (cxx_keyword_p ((NAME), (LEN))) \ + { \ + char *tmp_buf = (char *)alloca ((LEN)+1); \ + memcpy (tmp_buf, (NAME), (LEN)); \ + tmp_buf[LEN]= '$'; \ + (NAME) = tmp_buf; \ + (LEN)++; \ + } \ + } \ +while (0) + + /* If the assembler doesn't support UTF8 in symbol names, some characters might need to be escaped. */ @@ -54,10 +233,14 @@ extern struct obstack *mangle_obstack; void append_gpp_mangled_name (const char *name, int len) { - int encoded_len = unicode_mangling_length (name, len); - int needs_escapes = encoded_len > 0; + int encoded_len, needs_escapes; char buf[6]; + MANGLE_CXX_KEYWORDS (name, len); + + encoded_len = unicode_mangling_length (name, len); + needs_escapes = encoded_len > 0; + sprintf (buf, "%d", (needs_escapes ? encoded_len : len)); obstack_grow (mangle_obstack, buf, strlen (buf)); @@ -195,10 +378,14 @@ void append_gpp_mangled_name (const char *name, int len) { const unsigned char *ptr; - const unsigned char *limit = (const unsigned char *)name + len; + const unsigned char *limit; int encoded_len; char buf [6]; + MANGLE_CXX_KEYWORDS (name, len); + + limit = (const unsigned char *)name + len; + /* Compute the length of the string we wish to mangle. */ for (encoded_len = 0, ptr = (const unsigned char *) name; ptr < limit; encoded_len++) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index c6ec810e0e8..445649aae84 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,26 @@ +2009-06-29 Andrew Haley <aph@redhat.com> + + PR java/40590 + * tools/gnu/classpath/tools/javah/FieldHelper.java (print): + Use printName(). + * tools/gnu/classpath/tools/javah/MethodHelper.java (print): + Use printName(). + * tools/gnu/classpath/tools/javah/CniStubPrinter.java (printDecl): + Use printName(). + * tools/gnu/classpath/tools/javah/Keywords.java (words): Replace + with keywords list from gcc/java/mangle.c. + * tools/gnu/classpath/tools/javah/ClassWrapper.java (printMethods): + Don't pre-convert a C++ keyword. + (print(CniPrintStream)): Call CniPrintStream.printName(). + (printContents): Likewise. + * tools/gnu/classpath/tools/javah/CniPrintStream.java + (getClassName): Don't call replaceAll("/", "::"). + (print(Type)): Add ""::" befor name, " *" after. Use printName(), not + print. + (printName(PrintStream, String), printName(String), printlnName): + New methods. + (moveToPackage): Use printName(). + 2009-03-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure: Regenerate. diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class Binary files differindex 5c20124acbb..e853782fc85 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class Binary files differindex 1f0d890b789..0c7915ce042 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class Binary files differindex 8726cdd216e..e226ffbd5d7 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class Binary files differindex 9b7169fe519..3d6f235bb2b 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class Binary files differindex 7b6b063d7db..592ff470550 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class Binary files differindex 2bd32023281..71974cc7d10 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java index 43f31a2fd9c..22278eba84c 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java @@ -260,7 +260,7 @@ public class ClassWrapper if (bridgeTargets.contains(sum)) nameToUse = (String) methodNameMap.get(sum); else - nameToUse = Keywords.getCxxName(m.name); + nameToUse = m.name; methodNameMap.put(sum, nameToUse); MethodHelper.print(out, m, this, nameToUse); } @@ -291,7 +291,8 @@ public class ClassWrapper public void print(CniPrintStream out) { - out.print("::" + name.replaceAll("/", "::")); + out.print("::"); + out.printName(name); } // This prints the body of a class to a CxxPrintStream. @@ -303,7 +304,7 @@ public class ClassWrapper out.print("class "); // Don't use our print() -- we don't want the leading "::". - out.print(name.replaceAll("/", "::")); + out.printName(name); if (superClass != null) { out.print(" : public "); diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java index 64ba537d4d3..315fd8ae326 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java @@ -125,9 +125,10 @@ public class CniPrintStream // Add the plain class name; we'll handle it when // we process namespaces. allClasses.add(name); - return "::" + name.replaceAll("/", "::") + " *"; + return name; } + // Print the C++ form of TYPE, mangling C++ keywords. public void print(Type type) { int arrayCount = 0; @@ -141,7 +142,9 @@ public class CniPrintStream } if (type.getSort() == Type.OBJECT) { - print(getClassName(type)); + print("::"); + printName(getClassName(type)); + print(" *"); } else { @@ -156,6 +159,34 @@ public class CniPrintStream } } + // Print NAME, converting into C++ syntax and mangling C++ keywords + // as we go. + public final static void printName(PrintStream out, String name) + { + String[] parts = name.split("::|/"); + for (int i = 0; i < parts.length; i++) + { + if (i != 0) + out.print("::"); + out.print(Keywords.getCxxName(parts[i])); + } + } + + // Println NAME, converting into C++ syntax and mangling C++ + // keywords as we go. + public final static void printlnName(PrintStream out, String name) + { + printName(out, name); + out.println(); + } + + // Print NAME, converting into C++ syntax and mangling C++ keywords + // as we go. + final void printName(String name) + { + printName(this, name); + } + private void indent(PrintStream out, int n) { for (int i = 0; i < n; ++i) @@ -186,7 +217,7 @@ public class CniPrintStream { indent(out, j + 1); out.print("namespace "); - out.println(pkgParts[j]); + printlnName(out, pkgParts[j]); indent(out, j + 1); out.println("{"); } @@ -202,7 +233,7 @@ public class CniPrintStream moveToPackage(out, pkgParts); indent(out, pkgParts.length + 2); out.print("class "); - out.print(className); + printName(out, className); out.println(";"); } diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java index 3acec232889..bbdda9249a1 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java @@ -59,9 +59,9 @@ public class CniStubPrinter private void printDecl(CniPrintStream out, String className, MethodNode method) { - out.print(className); + out.printName(className); out.print("::"); - out.print(method.name); + out.printName(method.name); out.print("("); Type[] argTypes = Type.getArgumentTypes(method.desc); for (int j = 0; j < argTypes.length; ++j) diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java index f1c369af267..84b1fce8bf9 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java @@ -66,7 +66,7 @@ public class FieldHelper out.print(")))) "); result = true; } - out.print(Keywords.getCxxName(field.name)); + out.printName(field.name); if (hasMethodName) out.print("__"); if (Modifier.isStatic(field.access)) diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java index 46543ba45df..b281197c5e9 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java @@ -42,28 +42,115 @@ import java.util.HashSet; public class Keywords { - private static final String[] words = { "and", "and_eq", "asm", "auto", - "bitand", "bitor", "bool", "break", - "case", "catch", "char", "class", - "compl", "const", "const_cast", - "continue", "default", "delete", "do", - "double", "dynamic_cast", "else", - "enum", "explicit", "export", - "extern", "false", "float", "for", - "friend", "goto", "if", "inline", - "int", "long", "mutable", "namespace", - "new", "not", "not_eq", "operator", - "or", "or_eq", "private", "protected", - "public", "register", - "reinterpret_cast", "return", "short", - "signed", "sizeof", "static", - "static_cast", "struct", "switch", - "template", "this", "throw", "true", - "try", "typedef", "typeid", - "typename", "typeof", "union", - "unsigned", "using", "virtual", - "void", "volatile", "wchar_t", - "while", "xor", "xor_eq" }; +/* A sorted list of all C++ keywords. This is identical to the list + in gcc/java/mangle.c. */ + private static final String[] words = + { + "_Complex", + "__alignof", + "__alignof__", + "__asm", + "__asm__", + "__attribute", + "__attribute__", + "__builtin_va_arg", + "__complex", + "__complex__", + "__const", + "__const__", + "__extension__", + "__imag", + "__imag__", + "__inline", + "__inline__", + "__label__", + "__null", + "__real", + "__real__", + "__restrict", + "__restrict__", + "__signed", + "__signed__", + "__typeof", + "__typeof__", + "__volatile", + "__volatile__", + "and", + "and_eq", + "asm", + "auto", + "bitand", + "bitor", + "bool", + "break", + "case", + "catch", + "char", + "class", + "compl", + "const", + "const_cast", + "continue", + "default", + "delete", + "do", + "double", + "dynamic_cast", + "else", + "enum", + "explicit", + "export", + "extern", + "false", + "float", + "for", + "friend", + "goto", + "if", + "inline", + "int", + "long", + "mutable", + "namespace", + "new", + "not", + "not_eq", + "operator", + "or", + "or_eq", + "private", + "protected", + "public", + "register", + "reinterpret_cast", + "return", + "short", + "signed", + "sizeof", + "static", + "static_cast", + "struct", + "switch", + "template", + "this", + "throw", + "true", + "try", + "typedef", + "typeid", + "typename", + "typeof", + "union", + "unsigned", + "using", + "virtual", + "void", + "volatile", + "wchar_t", + "while", + "xor", + "xor_eq" + }; private static final HashSet keywords; static diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java index 4359523ba05..e12e47c540e 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java @@ -97,14 +97,14 @@ public class MethodHelper { out.print(Type.getReturnType(meth.desc)); out.print(" "); - out.print(realMethodName); + out.printName(realMethodName); } else { String name = declarer.name; int index = name.lastIndexOf('/'); name = name.substring(index + 1); - out.print(name); + out.printName(name); } out.print("("); Type[] argTypes = Type.getArgumentTypes(meth.desc); diff --git a/libjava/gnu/xml/stream/AttributeImpl.h b/libjava/gnu/xml/stream/AttributeImpl.h index 8fc37c01d3b..dac7c27333e 100644 --- a/libjava/gnu/xml/stream/AttributeImpl.h +++ b/libjava/gnu/xml/stream/AttributeImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -39,16 +39,16 @@ class gnu::xml::stream::AttributeImpl : public ::gnu::xml::stream::XMLEventImpl { public: // actually protected - AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::lang::String *, ::java::lang::String *, jboolean); + AttributeImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::lang::String *, ::java::lang::String *, jboolean); public: virtual jint getEventType(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual ::java::lang::String * getValue(); virtual ::java::lang::String * getDTDType(); virtual jboolean isSpecified(); virtual void writeAsEncodedUnicode(::java::io::Writer *); public: // actually protected - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; ::java::lang::String * value; ::java::lang::String * type; jboolean specified; diff --git a/libjava/gnu/xml/stream/EndElementImpl.h b/libjava/gnu/xml/stream/EndElementImpl.h index cc1dba81601..2461d21d6c5 100644 --- a/libjava/gnu/xml/stream/EndElementImpl.h +++ b/libjava/gnu/xml/stream/EndElementImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -39,14 +39,14 @@ class gnu::xml::stream::EndElementImpl : public ::gnu::xml::stream::XMLEventImpl { public: // actually protected - EndElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::util::List *); + EndElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *); public: virtual jint getEventType(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual ::java::util::Iterator * getNamespaces(); virtual void writeAsEncodedUnicode(::java::io::Writer *); public: // actually protected - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; ::java::util::List * namespaces; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/stream/StartElementImpl.h b/libjava/gnu/xml/stream/StartElementImpl.h index 13b1dc64679..1cd062b20df 100644 --- a/libjava/gnu/xml/stream/StartElementImpl.h +++ b/libjava/gnu/xml/stream/StartElementImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -44,21 +44,21 @@ class gnu::xml::stream::StartElementImpl : public ::gnu::xml::stream::XMLEventIm { public: // actually protected - StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace::NamespaceContext *); + StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace$::NamespaceContext *); public: virtual jint getEventType(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual ::java::util::Iterator * getAttributes(); virtual ::java::util::Iterator * getNamespaces(); - virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); virtual ::java::lang::String * getNamespaceURI(::java::lang::String *); virtual void writeAsEncodedUnicode(::java::io::Writer *); public: // actually protected - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; ::java::util::List * attributes; ::java::util::List * namespaces; - ::javax::xml::namespace::NamespaceContext * namespaceContext; + ::javax::xml::namespace$::NamespaceContext * namespaceContext; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/stream/XIncludeFilter.h b/libjava/gnu/xml/stream/XIncludeFilter.h index 36e488a6015..794eaa71c47 100644 --- a/libjava/gnu/xml/stream/XIncludeFilter.h +++ b/libjava/gnu/xml/stream/XIncludeFilter.h @@ -32,7 +32,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -79,7 +79,7 @@ public: virtual ::java::lang::String * getAttributeLocalName(jint); virtual ::java::lang::String * getAttributeNamespace(jint); virtual ::java::lang::String * getAttributePrefix(jint); - virtual ::javax::xml::namespace::QName * getAttributeName(jint); + virtual ::javax::xml::namespace$::QName * getAttributeName(jint); virtual ::java::lang::String * getAttributeType(jint); virtual jboolean isAttributeSpecified(jint); virtual ::java::lang::String * getAttributeValue(jint); @@ -87,7 +87,7 @@ public: virtual ::java::lang::String * getElementText(); virtual jint getEventType(); virtual ::java::lang::String * getLocalName(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual ::java::lang::String * getNamespaceURI(); virtual ::java::lang::String * getPIData(); virtual ::java::lang::String * getPITarget(); diff --git a/libjava/gnu/xml/stream/XMLEventFactoryImpl.h b/libjava/gnu/xml/stream/XMLEventFactoryImpl.h index b8ebf0bcda5..714dbc18233 100644 --- a/libjava/gnu/xml/stream/XMLEventFactoryImpl.h +++ b/libjava/gnu/xml/stream/XMLEventFactoryImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -59,14 +59,14 @@ public: virtual void setLocation(::javax::xml::stream::Location *); virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *); virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *); - virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace::QName *, ::java::lang::String *); + virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *); virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *); virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *); - virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace::QName *, ::java::util::Iterator *, ::java::util::Iterator *); + virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *); virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *); - virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace::NamespaceContext *); - virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace::QName *, ::java::util::Iterator *); + virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace$::NamespaceContext *); + virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *); virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *); virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *); diff --git a/libjava/gnu/xml/stream/XMLEventImpl.h b/libjava/gnu/xml/stream/XMLEventImpl.h index 46432d3506d..13b793ef1c7 100644 --- a/libjava/gnu/xml/stream/XMLEventImpl.h +++ b/libjava/gnu/xml/stream/XMLEventImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -61,7 +61,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement(); virtual ::javax::xml::stream::events::EndElement * asEndElement(); virtual ::javax::xml::stream::events::Characters * asCharacters(); - virtual ::javax::xml::namespace::QName * getSchemaType(); + virtual ::javax::xml::namespace$::QName * getSchemaType(); virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; public: // actually protected virtual ::java::lang::String * encode(::java::lang::String *, jboolean); diff --git a/libjava/gnu/xml/stream/XMLEventWriterImpl.h b/libjava/gnu/xml/stream/XMLEventWriterImpl.h index 77c10a53399..e81d0896aba 100644 --- a/libjava/gnu/xml/stream/XMLEventWriterImpl.h +++ b/libjava/gnu/xml/stream/XMLEventWriterImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; } @@ -53,8 +53,8 @@ public: virtual ::java::lang::String * getPrefix(::java::lang::String *); virtual void setPrefix(::java::lang::String *, ::java::lang::String *); virtual void setDefaultNamespace(::java::lang::String *); - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); public: // actually protected ::javax::xml::stream::XMLStreamWriter * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer; public: diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h index 0fb26669387..319c2c4a385 100644 --- a/libjava/gnu/xml/stream/XMLParser.h +++ b/libjava/gnu/xml/stream/XMLParser.h @@ -39,7 +39,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -64,12 +64,12 @@ public: virtual ::java::lang::String * getPrefix(::java::lang::String *); virtual ::java::util::Iterator * getPrefixes(::java::lang::String *); virtual void close(); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); virtual jint getAttributeCount(); virtual ::java::lang::String * getAttributeLocalName(jint); virtual ::java::lang::String * getAttributeNamespace(jint); virtual ::java::lang::String * getAttributePrefix(jint); - virtual ::javax::xml::namespace::QName * getAttributeName(jint); + virtual ::javax::xml::namespace$::QName * getAttributeName(jint); virtual ::java::lang::String * getAttributeType(jint); private: ::java::lang::String * getAttributeType(::java::lang::String *, ::java::lang::String *); @@ -85,7 +85,7 @@ public: virtual jint getEventType(); virtual ::java::lang::String * getLocalName(); virtual ::javax::xml::stream::Location * getLocation(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual jint getNamespaceCount(); virtual ::java::lang::String * getNamespacePrefix(jint); virtual ::java::lang::String * getNamespaceURI(); diff --git a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h index ffd534947bc..d2059574347 100644 --- a/libjava/gnu/xml/stream/XMLStreamWriterImpl.h +++ b/libjava/gnu/xml/stream/XMLStreamWriterImpl.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; } @@ -89,8 +89,8 @@ public: virtual ::java::lang::String * getPrefix(::java::lang::String *); virtual void setPrefix(::java::lang::String *, ::java::lang::String *); virtual void setDefaultNamespace(::java::lang::String *); - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); virtual ::java::lang::Object * getProperty(::java::lang::String *); private: void writeEncoded(::java::lang::String *, jboolean); @@ -103,7 +103,7 @@ public: // actually protected ::java::io::Writer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) writer; ::java::lang::String * encoding; jboolean prefixDefaulting; - ::javax::xml::namespace::NamespaceContext * namespaceContext; + ::javax::xml::namespace$::NamespaceContext * namespaceContext; private: ::java::util::LinkedList * elements; jboolean inStartElement; diff --git a/libjava/gnu/xml/transform/AbstractNumberNode.h b/libjava/gnu/xml/transform/AbstractNumberNode.h index 20dadf66a6a..d82794dacb6 100644 --- a/libjava/gnu/xml/transform/AbstractNumberNode.h +++ b/libjava/gnu/xml/transform/AbstractNumberNode.h @@ -34,7 +34,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -57,7 +57,7 @@ class gnu::xml::transform::AbstractNumberNode : public ::gnu::xml::transform::Te public: // actually package-private AbstractNumberNode(::gnu::xml::transform::TemplateNode *, ::java::lang::String *, jint, ::java::lang::String *, jint); - virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); virtual ::java::lang::String * format(::java::lang::String *, JArray< jint > *); virtual void format(::gnu::java::lang::CPStringBuilder *, jint, ::java::lang::String *); static jboolean isAlphanumeric(jchar); @@ -65,7 +65,7 @@ public: // actually package-private static ::java::lang::String * roman(jboolean, jint); virtual JArray< jint > * compute(::gnu::xml::transform::Stylesheet *, ::org::w3c::dom::Node *, jint, jint) = 0; public: - virtual jboolean references(::javax::xml::namespace::QName *); + virtual jboolean references(::javax::xml::namespace$::QName *); virtual ::java::lang::String * toString(); public: // actually package-private static const jint ALPHABETIC = 0; diff --git a/libjava/gnu/xml/transform/ApplyImportsNode.h b/libjava/gnu/xml/transform/ApplyImportsNode.h index f9e19a61d0e..53f45e97532 100644 --- a/libjava/gnu/xml/transform/ApplyImportsNode.h +++ b/libjava/gnu/xml/transform/ApplyImportsNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::ApplyImportsNode : public ::gnu::xml::transform::Temp public: // actually package-private ApplyImportsNode(); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/ApplyTemplatesNode.h b/libjava/gnu/xml/transform/ApplyTemplatesNode.h index 02f49a22b63..c25d2f53b51 100644 --- a/libjava/gnu/xml/transform/ApplyTemplatesNode.h +++ b/libjava/gnu/xml/transform/ApplyTemplatesNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,15 +51,15 @@ class gnu::xml::transform::ApplyTemplatesNode : public ::gnu::xml::transform::Te { public: // actually package-private - ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace::QName *, ::java::util::List *, ::java::util::List *, jboolean); + ApplyTemplatesNode(::gnu::xml::xpath::Expr *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, jboolean); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select; - ::javax::xml::namespace::QName * mode; + ::javax::xml::namespace$::QName * mode; ::java::util::List * sortKeys; ::java::util::List * withParams; jboolean isDefault; diff --git a/libjava/gnu/xml/transform/AttributeNode.h b/libjava/gnu/xml/transform/AttributeNode.h index 80f6d3cc3d5..b83f7c8c0ef 100644 --- a/libjava/gnu/xml/transform/AttributeNode.h +++ b/libjava/gnu/xml/transform/AttributeNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,11 +49,11 @@ class gnu::xml::transform::AttributeNode : public ::gnu::xml::transform::Templat public: // actually package-private AttributeNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::org::w3c::dom::Node *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); ::java::lang::String * getPrefix(::java::lang::String *); ::java::lang::String * inventPrefix(::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; diff --git a/libjava/gnu/xml/transform/Bindings.h b/libjava/gnu/xml/transform/Bindings.h index a54ab174e15..abbc8f0c6d6 100644 --- a/libjava/gnu/xml/transform/Bindings.h +++ b/libjava/gnu/xml/transform/Bindings.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,12 +53,12 @@ public: // actually package-private virtual void push(jint); virtual void pop(jint); public: - virtual jboolean containsKey(::javax::xml::namespace::QName *, jint); - virtual ::java::lang::Object * get(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint); + virtual jboolean containsKey(::javax::xml::namespace$::QName *, jint); + virtual ::java::lang::Object * get(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint); public: // actually package-private - virtual void set(::javax::xml::namespace::QName *, ::java::lang::Object *, jint); + virtual void set(::javax::xml::namespace$::QName *, ::java::lang::Object *, jint); public: - virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *); + virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *); virtual ::java::lang::String * toString(); public: // actually package-private static const jint VARIABLE = 0; diff --git a/libjava/gnu/xml/transform/CallTemplateNode.h b/libjava/gnu/xml/transform/CallTemplateNode.h index f7d32ade246..03b2d179db3 100644 --- a/libjava/gnu/xml/transform/CallTemplateNode.h +++ b/libjava/gnu/xml/transform/CallTemplateNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -47,14 +47,14 @@ class gnu::xml::transform::CallTemplateNode : public ::gnu::xml::transform::Temp { public: // actually package-private - CallTemplateNode(::javax::xml::namespace::QName *, ::java::util::List *); + CallTemplateNode(::javax::xml::namespace$::QName *, ::java::util::List *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; ::java::util::List * withParams; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/ChooseNode.h b/libjava/gnu/xml/transform/ChooseNode.h index 88574784fef..33519454be9 100644 --- a/libjava/gnu/xml/transform/ChooseNode.h +++ b/libjava/gnu/xml/transform/ChooseNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::ChooseNode : public ::gnu::xml::transform::TemplateNo public: // actually package-private ChooseNode(); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/CommentNode.h b/libjava/gnu/xml/transform/CommentNode.h index 2f04431d0d2..78b6d184386 100644 --- a/libjava/gnu/xml/transform/CommentNode.h +++ b/libjava/gnu/xml/transform/CommentNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::CommentNode : public ::gnu::xml::transform::TemplateN public: // actually package-private CommentNode(); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/CopyNode.h b/libjava/gnu/xml/transform/CopyNode.h index a57c004d321..e724dbbe1f9 100644 --- a/libjava/gnu/xml/transform/CopyNode.h +++ b/libjava/gnu/xml/transform/CopyNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,8 +49,8 @@ class gnu::xml::transform::CopyNode : public ::gnu::xml::transform::TemplateNode public: // actually package-private CopyNode(::java::lang::String *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); - void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *); public: ::java::lang::String * toString(); public: // actually package-private diff --git a/libjava/gnu/xml/transform/CopyOfNode.h b/libjava/gnu/xml/transform/CopyOfNode.h index f33944630d6..4bf660768c0 100644 --- a/libjava/gnu/xml/transform/CopyOfNode.h +++ b/libjava/gnu/xml/transform/CopyOfNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,9 +53,9 @@ class gnu::xml::transform::CopyOfNode : public ::gnu::xml::transform::TemplateNo public: // actually package-private CopyOfNode(::gnu::xml::xpath::Expr *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select; diff --git a/libjava/gnu/xml/transform/CurrentFunction.h b/libjava/gnu/xml/transform/CurrentFunction.h index dee45ec7b45..118bfe54fd5 100644 --- a/libjava/gnu/xml/transform/CurrentFunction.h +++ b/libjava/gnu/xml/transform/CurrentFunction.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -56,7 +56,7 @@ public: void setArguments(::java::util::List *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet; diff --git a/libjava/gnu/xml/transform/DocumentFunction.h b/libjava/gnu/xml/transform/DocumentFunction.h index a599fc44b0e..88c31dcfa97 100644 --- a/libjava/gnu/xml/transform/DocumentFunction.h +++ b/libjava/gnu/xml/transform/DocumentFunction.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -59,7 +59,7 @@ public: // actually package-private ::java::util::Collection * document(::java::lang::String *, ::java::lang::String *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet; ::org::w3c::dom::Node * base; diff --git a/libjava/gnu/xml/transform/ElementAvailableFunction.h b/libjava/gnu/xml/transform/ElementAvailableFunction.h index 0d25fe354d9..21a828abe2c 100644 --- a/libjava/gnu/xml/transform/ElementAvailableFunction.h +++ b/libjava/gnu/xml/transform/ElementAvailableFunction.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -50,17 +50,17 @@ class gnu::xml::transform::ElementAvailableFunction : public ::gnu::xml::xpath:: { public: // actually package-private - ElementAvailableFunction(::javax::xml::namespace::NamespaceContext *); + ElementAvailableFunction(::javax::xml::namespace$::NamespaceContext *); public: virtual ::java::lang::Object * evaluate(::java::util::List *); virtual void setArguments(::java::util::List *); virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - virtual jboolean references(::javax::xml::namespace::QName *); + virtual jboolean references(::javax::xml::namespace$::QName *); virtual ::java::lang::String * toString(); public: // actually package-private static ::java::util::Collection * elements; - ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx; + ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx; ::java::util::List * args; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/ElementNode.h b/libjava/gnu/xml/transform/ElementNode.h index 73d0f0fb216..b086d2ad582 100644 --- a/libjava/gnu/xml/transform/ElementNode.h +++ b/libjava/gnu/xml/transform/ElementNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,11 +49,11 @@ class gnu::xml::transform::ElementNode : public ::gnu::xml::transform::TemplateN public: // actually package-private ElementNode(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::java::lang::String *, ::org::w3c::dom::Node *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); ::java::lang::String * getPrefix(::java::lang::String *); - void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *); + void addAttributeSet(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *, ::java::lang::String *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; diff --git a/libjava/gnu/xml/transform/ForEachNode.h b/libjava/gnu/xml/transform/ForEachNode.h index 1cb11affc92..7b251d39b44 100644 --- a/libjava/gnu/xml/transform/ForEachNode.h +++ b/libjava/gnu/xml/transform/ForEachNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,9 +53,9 @@ class gnu::xml::transform::ForEachNode : public ::gnu::xml::transform::TemplateN public: // actually package-private ForEachNode(::gnu::xml::xpath::Expr *, ::java::util::List *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select; diff --git a/libjava/gnu/xml/transform/FormatNumberFunction.h b/libjava/gnu/xml/transform/FormatNumberFunction.h index 417e8973805..634dc643a32 100644 --- a/libjava/gnu/xml/transform/FormatNumberFunction.h +++ b/libjava/gnu/xml/transform/FormatNumberFunction.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -56,7 +56,7 @@ public: void setArguments(::java::util::List *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) stylesheet; ::java::util::List * args; diff --git a/libjava/gnu/xml/transform/FunctionAvailableFunction.h b/libjava/gnu/xml/transform/FunctionAvailableFunction.h index b900a1b7a31..b34bfb0ad35 100644 --- a/libjava/gnu/xml/transform/FunctionAvailableFunction.h +++ b/libjava/gnu/xml/transform/FunctionAvailableFunction.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -50,18 +50,18 @@ class gnu::xml::transform::FunctionAvailableFunction : public ::gnu::xml::xpath: { public: // actually package-private - FunctionAvailableFunction(::javax::xml::namespace::NamespaceContext *); + FunctionAvailableFunction(::javax::xml::namespace$::NamespaceContext *); public: virtual ::java::lang::Object * evaluate(::java::util::List *); virtual void setArguments(::java::util::List *); virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - virtual jboolean references(::javax::xml::namespace::QName *); + virtual jboolean references(::javax::xml::namespace$::QName *); virtual ::java::lang::String * toString(); public: // actually package-private static ::java::util::Collection * xsltFunctions; static ::java::util::Collection * xpathFunctions; - ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx; + ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) nsctx; ::java::util::List * args; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/GenerateIdFunction.h b/libjava/gnu/xml/transform/GenerateIdFunction.h index 8b1de4a182c..fe43452635d 100644 --- a/libjava/gnu/xml/transform/GenerateIdFunction.h +++ b/libjava/gnu/xml/transform/GenerateIdFunction.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -55,7 +55,7 @@ public: void setArguments(::java::util::List *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args; public: diff --git a/libjava/gnu/xml/transform/IfNode.h b/libjava/gnu/xml/transform/IfNode.h index dff1c470ace..357da0d1903 100644 --- a/libjava/gnu/xml/transform/IfNode.h +++ b/libjava/gnu/xml/transform/IfNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,9 +53,9 @@ class gnu::xml::transform::IfNode : public ::gnu::xml::transform::TemplateNode public: // actually package-private IfNode(::gnu::xml::xpath::Expr *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) test; diff --git a/libjava/gnu/xml/transform/Key.h b/libjava/gnu/xml/transform/Key.h index 8588b2ffea4..08ff987acd5 100644 --- a/libjava/gnu/xml/transform/Key.h +++ b/libjava/gnu/xml/transform/Key.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -41,9 +41,9 @@ class gnu::xml::transform::Key : public ::java::lang::Object { public: // actually package-private - Key(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *); + Key(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::xpath::Expr *); virtual ::gnu::xml::transform::Key * clone(::gnu::xml::transform::Stylesheet *); - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; ::gnu::xml::xpath::Pattern * match; ::gnu::xml::xpath::Expr * use; public: diff --git a/libjava/gnu/xml/transform/KeyFunction.h b/libjava/gnu/xml/transform/KeyFunction.h index d9185e38020..7da94b1d597 100644 --- a/libjava/gnu/xml/transform/KeyFunction.h +++ b/libjava/gnu/xml/transform/KeyFunction.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -61,7 +61,7 @@ public: // actually package-private void addKeyNodeIfMatch(::org::w3c::dom::Node *, ::java::util::Collection *, ::java::lang::String *, ::java::util::Collection *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) stylesheet; ::java::util::List * args; diff --git a/libjava/gnu/xml/transform/LiteralNode.h b/libjava/gnu/xml/transform/LiteralNode.h index 056f5f1124f..c314eae2583 100644 --- a/libjava/gnu/xml/transform/LiteralNode.h +++ b/libjava/gnu/xml/transform/LiteralNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::LiteralNode : public ::gnu::xml::transform::TemplateN public: // actually package-private LiteralNode(::org::w3c::dom::Node *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); public: // actually package-private diff --git a/libjava/gnu/xml/transform/MessageNode.h b/libjava/gnu/xml/transform/MessageNode.h index 06fda75e92e..ebffd3d497a 100644 --- a/libjava/gnu/xml/transform/MessageNode.h +++ b/libjava/gnu/xml/transform/MessageNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::MessageNode : public ::gnu::xml::transform::TemplateN public: // actually package-private MessageNode(jboolean); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); public: // actually package-private diff --git a/libjava/gnu/xml/transform/OtherwiseNode.h b/libjava/gnu/xml/transform/OtherwiseNode.h index ecd01817185..2a067a548b9 100644 --- a/libjava/gnu/xml/transform/OtherwiseNode.h +++ b/libjava/gnu/xml/transform/OtherwiseNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::OtherwiseNode : public ::gnu::xml::transform::Templat public: // actually package-private OtherwiseNode(); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h index aebd3e05054..786be5aa824 100644 --- a/libjava/gnu/xml/transform/ParameterNode.h +++ b/libjava/gnu/xml/transform/ParameterNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,12 +51,12 @@ class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::Templat { public: // actually package-private - ParameterNode(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *, jint); + ParameterNode(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *, jint); ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); - ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *); ::java::lang::String * toString(); public: // actually package-private @@ -64,7 +64,7 @@ public: // actually package-private public: jint compareTo(::java::lang::Object *); public: // actually package-private - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name; ::gnu::xml::xpath::Expr * select; jint type; public: diff --git a/libjava/gnu/xml/transform/ProcessingInstructionNode.h b/libjava/gnu/xml/transform/ProcessingInstructionNode.h index f8339159386..35bae5f7802 100644 --- a/libjava/gnu/xml/transform/ProcessingInstructionNode.h +++ b/libjava/gnu/xml/transform/ProcessingInstructionNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::ProcessingInstructionNode : public ::gnu::xml::transf public: // actually package-private ProcessingInstructionNode(::java::lang::String *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); public: // actually package-private diff --git a/libjava/gnu/xml/transform/SortKey.h b/libjava/gnu/xml/transform/SortKey.h index b35aa5b12c9..a8e0a294222 100644 --- a/libjava/gnu/xml/transform/SortKey.h +++ b/libjava/gnu/xml/transform/SortKey.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,8 +53,8 @@ class gnu::xml::transform::SortKey : public ::java::lang::Object public: // actually package-private SortKey(::gnu::xml::xpath::Expr *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::TemplateNode *); ::java::lang::String * key(::org::w3c::dom::Node *); - void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); - jboolean references(::javax::xml::namespace::QName *); + void init(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + jboolean references(::javax::xml::namespace$::QName *); ::gnu::xml::transform::SortKey * clone(::gnu::xml::transform::Stylesheet *); private: ::gnu::xml::transform::TemplateNode * cloneAttributeValueTemplate(::gnu::xml::transform::TemplateNode *, ::gnu::xml::transform::Stylesheet *); diff --git a/libjava/gnu/xml/transform/Stylesheet.h b/libjava/gnu/xml/transform/Stylesheet.h index 8bfebcc05c9..69ceaa82257 100644 --- a/libjava/gnu/xml/transform/Stylesheet.h +++ b/libjava/gnu/xml/transform/Stylesheet.h @@ -33,7 +33,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -74,9 +74,9 @@ public: virtual ::java::lang::String * getPrefix(::java::lang::String *); virtual ::java::util::Iterator * getPrefixes(::java::lang::String *); public: // actually package-private - virtual ::javax::xml::namespace::QName * getQName(::java::lang::String *); - virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jboolean); - virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace::QName *, ::javax::xml::namespace::QName *); + virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *); + virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jboolean); + virtual ::gnu::xml::transform::TemplateNode * getTemplate(::javax::xml::namespace$::QName *, ::javax::xml::namespace$::QName *); virtual ::gnu::xml::transform::Template * parseTemplate(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *); virtual void parseOutput(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *); virtual void parseKey(::org::w3c::dom::Node *, ::org::w3c::dom::NamedNodeMap *); @@ -93,7 +93,7 @@ public: // actually package-private virtual ::gnu::xml::transform::TemplateNode * parseAttributeValueTemplate(::java::lang::String *, ::org::w3c::dom::Node *); virtual jboolean isPreserved(::org::w3c::dom::Text *, jboolean); public: - virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint); + virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint); public: // actually package-private virtual ::gnu::xml::transform::TemplateNode * parseApplyTemplates(::org::w3c::dom::Node *); virtual ::gnu::xml::transform::TemplateNode * parseCallTemplate(::org::w3c::dom::Node *); diff --git a/libjava/gnu/xml/transform/SystemPropertyFunction.h b/libjava/gnu/xml/transform/SystemPropertyFunction.h index dbbdc2d36f2..e1f16d9ceaf 100644 --- a/libjava/gnu/xml/transform/SystemPropertyFunction.h +++ b/libjava/gnu/xml/transform/SystemPropertyFunction.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -55,10 +55,10 @@ public: void setArguments(::java::util::List *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); public: // actually package-private - ::java::lang::Object * systemProperty(::javax::xml::namespace::QName *); + ::java::lang::Object * systemProperty(::javax::xml::namespace$::QName *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args; public: diff --git a/libjava/gnu/xml/transform/Template.h b/libjava/gnu/xml/transform/Template.h index 3b26715d785..018beacfeeb 100644 --- a/libjava/gnu/xml/transform/Template.h +++ b/libjava/gnu/xml/transform/Template.h @@ -31,7 +31,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,31 +53,31 @@ class gnu::xml::transform::Template : public ::java::lang::Object { public: // actually package-private - Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace::QName *); + Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *); private: - Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace::QName *, jboolean); + Template(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Pattern *, ::gnu::xml::transform::TemplateNode *, jint, jdouble, ::javax::xml::namespace$::QName *, jboolean); public: // actually package-private virtual ::gnu::xml::transform::Template * clone(::gnu::xml::transform::Stylesheet *); public: virtual jint compareTo(::java::lang::Object *); public: // actually package-private virtual ::gnu::xml::xpath::Test * getNodeTest(::gnu::xml::xpath::Expr *); - virtual jboolean matches(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *); - virtual jboolean matches(::javax::xml::namespace::QName *); + virtual jboolean matches(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *); + virtual jboolean matches(::javax::xml::namespace$::QName *); virtual jboolean imports(::gnu::xml::transform::Template *); - virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: virtual ::java::lang::String * toString(); public: // actually package-private virtual void list(::java::io::PrintStream *); static jdouble DEFAULT_PRIORITY; ::gnu::xml::transform::Stylesheet * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stylesheet; - ::javax::xml::namespace::QName * name; + ::javax::xml::namespace$::QName * name; ::gnu::xml::xpath::Pattern * match; ::gnu::xml::transform::TemplateNode * node; jdouble priority; jint precedence; - ::javax::xml::namespace::QName * mode; + ::javax::xml::namespace$::QName * mode; jboolean isAnyNode; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/transform/TemplateNode.h b/libjava/gnu/xml/transform/TemplateNode.h index b5ecbc81753..354ff78c834 100644 --- a/libjava/gnu/xml/transform/TemplateNode.h +++ b/libjava/gnu/xml/transform/TemplateNode.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -47,14 +47,14 @@ class gnu::xml::transform::TemplateNode : public ::java::lang::Object public: // actually package-private TemplateNode(); - virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); - virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0; + virtual void apply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + virtual void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *) = 0; virtual ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *) = 0; public: - virtual jboolean references(::javax::xml::namespace::QName *); + virtual jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private virtual void list(jint, ::java::io::PrintStream *, jboolean); - virtual jboolean hasParam(::javax::xml::namespace::QName *); + virtual jboolean hasParam(::javax::xml::namespace$::QName *); static ::java::util::Comparator * documentOrderComparator; ::gnu::xml::transform::TemplateNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) children; ::gnu::xml::transform::TemplateNode * next; diff --git a/libjava/gnu/xml/transform/TextNode.h b/libjava/gnu/xml/transform/TextNode.h index a78bc1cd3f0..9a832d1c1f4 100644 --- a/libjava/gnu/xml/transform/TextNode.h +++ b/libjava/gnu/xml/transform/TextNode.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ class gnu::xml::transform::TextNode : public ::gnu::xml::transform::TemplateNode public: // actually package-private TextNode(jboolean); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: ::java::lang::String * toString(); public: // actually package-private diff --git a/libjava/gnu/xml/transform/TransformerImpl.h b/libjava/gnu/xml/transform/TransformerImpl.h index 47c1d9a9f35..9d10bd25e6f 100644 --- a/libjava/gnu/xml/transform/TransformerImpl.h +++ b/libjava/gnu/xml/transform/TransformerImpl.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -86,7 +86,7 @@ public: public: // actually package-private virtual void reindent(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, jint); virtual void convertCdataSectionElements(::org::w3c::dom::Document *, ::org::w3c::dom::Node *, ::java::util::List *); - virtual jboolean match(::javax::xml::namespace::QName *, ::org::w3c::dom::Node *); + virtual jboolean match(::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *); ::gnu::xml::transform::TransformerFactoryImpl * __attribute__((aligned(__alignof__( ::javax::xml::transform::Transformer)))) factory; ::gnu::xml::transform::Stylesheet * stylesheet; ::javax::xml::transform::URIResolver * uriResolver; diff --git a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h index c1b94c9466b..646bb3b7b1a 100644 --- a/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h +++ b/libjava/gnu/xml/transform/UnparsedEntityUriFunction.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -55,7 +55,7 @@ public: void setArguments(::java::util::List *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); public: // actually package-private ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args; public: diff --git a/libjava/gnu/xml/transform/ValueOfNode.h b/libjava/gnu/xml/transform/ValueOfNode.h index cfd13176529..30ed40daae4 100644 --- a/libjava/gnu/xml/transform/ValueOfNode.h +++ b/libjava/gnu/xml/transform/ValueOfNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,9 +53,9 @@ class gnu::xml::transform::ValueOfNode : public ::gnu::xml::transform::TemplateN public: // actually package-private ValueOfNode(::gnu::xml::xpath::Expr *, jboolean); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) select; diff --git a/libjava/gnu/xml/transform/WhenNode.h b/libjava/gnu/xml/transform/WhenNode.h index c904902c3b6..835b3827720 100644 --- a/libjava/gnu/xml/transform/WhenNode.h +++ b/libjava/gnu/xml/transform/WhenNode.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,9 +53,9 @@ class gnu::xml::transform::WhenNode : public ::gnu::xml::transform::TemplateNode public: // actually package-private WhenNode(::gnu::xml::xpath::Expr *); ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *); - void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); + void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) test; diff --git a/libjava/gnu/xml/transform/WithParam.h b/libjava/gnu/xml/transform/WithParam.h index c5882691aeb..1d50e255189 100644 --- a/libjava/gnu/xml/transform/WithParam.h +++ b/libjava/gnu/xml/transform/WithParam.h @@ -29,7 +29,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,12 +51,12 @@ class gnu::xml::transform::WithParam : public ::java::lang::Object { public: // actually package-private - WithParam(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *); - WithParam(::javax::xml::namespace::QName *, ::gnu::xml::transform::TemplateNode *); - ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint); + WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::xpath::Expr *); + WithParam(::javax::xml::namespace$::QName *, ::gnu::xml::transform::TemplateNode *); + ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace$::QName *, ::org::w3c::dom::Node *, jint, jint); ::gnu::xml::transform::WithParam * clone(::gnu::xml::transform::Stylesheet *); - jboolean references(::javax::xml::namespace::QName *); - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; + jboolean references(::javax::xml::namespace$::QName *); + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; ::gnu::xml::xpath::Expr * select; ::gnu::xml::transform::TemplateNode * content; public: diff --git a/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h b/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h index 805e1ae5884..29b46ef06dd 100644 --- a/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h +++ b/libjava/gnu/xml/validation/datatype/AtomicSimpleType.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,9 +50,9 @@ class gnu::xml::validation::datatype::AtomicSimpleType : public ::gnu::xml::vali { public: - AtomicSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *); + AtomicSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *); public: // actually package-private - AtomicSimpleType(::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::SimpleType *); + AtomicSimpleType(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *); public: virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *); static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/validation/datatype/ListSimpleType.h b/libjava/gnu/xml/validation/datatype/ListSimpleType.h index b8add0fb397..965b8643129 100644 --- a/libjava/gnu/xml/validation/datatype/ListSimpleType.h +++ b/libjava/gnu/xml/validation/datatype/ListSimpleType.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::ListSimpleType : public ::gnu::xml::valida { public: - ListSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *); + ListSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *); virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *); ::gnu::xml::validation::datatype::SimpleType * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) itemType; static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/validation/datatype/SimpleType.h b/libjava/gnu/xml/validation/datatype/SimpleType.h index fcdaa098c9f..2827d89f80a 100644 --- a/libjava/gnu/xml/validation/datatype/SimpleType.h +++ b/libjava/gnu/xml/validation/datatype/SimpleType.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::SimpleType : public ::gnu::xml::validation { public: - SimpleType(::javax::xml::namespace::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *); + SimpleType(::javax::xml::namespace$::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *); virtual jboolean isValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *); virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *); private: diff --git a/libjava/gnu/xml/validation/datatype/Type.h b/libjava/gnu/xml/validation/datatype/Type.h index 17979387cc5..7cf557bb02a 100644 --- a/libjava/gnu/xml/validation/datatype/Type.h +++ b/libjava/gnu/xml/validation/datatype/Type.h @@ -26,7 +26,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -38,9 +38,9 @@ class gnu::xml::validation::datatype::Type : public ::java::lang::Object { public: - Type(::javax::xml::namespace::QName *); + Type(::javax::xml::namespace$::QName *); static ::gnu::xml::validation::datatype::Type * ANY_TYPE; - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/validation/datatype/UnionSimpleType.h b/libjava/gnu/xml/validation/datatype/UnionSimpleType.h index b0b27daaa30..db8c265d842 100644 --- a/libjava/gnu/xml/validation/datatype/UnionSimpleType.h +++ b/libjava/gnu/xml/validation/datatype/UnionSimpleType.h @@ -28,7 +28,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::UnionSimpleType : public ::gnu::xml::valid { public: - UnionSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *); + UnionSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *); virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *); ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) memberTypes; static ::java::lang::Class class$; diff --git a/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h b/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h index 4465791c0a8..5b7d1fcb0b4 100644 --- a/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h +++ b/libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h @@ -31,7 +31,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -43,14 +43,14 @@ class gnu::xml::validation::xmlschema::AttributeDeclaration : public ::java::lan { public: // actually package-private - AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *); + AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *); static const jint NONE = 0; static const jint DEFAULT = 1; static const jint FIXED = 2; jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) scope; jint type; ::java::lang::String * value; - ::javax::xml::namespace::QName * name; + ::javax::xml::namespace$::QName * name; ::gnu::xml::validation::datatype::SimpleType * datatype; ::gnu::xml::validation::datatype::Annotation * annotation; public: diff --git a/libjava/gnu/xml/validation/xmlschema/ComplexType.h b/libjava/gnu/xml/validation/xmlschema/ComplexType.h index 189a0757c79..170ab9db98f 100644 --- a/libjava/gnu/xml/validation/xmlschema/ComplexType.h +++ b/libjava/gnu/xml/validation/xmlschema/ComplexType.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -39,8 +39,8 @@ class gnu::xml::validation::xmlschema::ComplexType : public ::gnu::xml::validati { public: // actually package-private - ComplexType(::javax::xml::namespace::QName *, jboolean, jint, jint); - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType; + ComplexType(::javax::xml::namespace$::QName *, jboolean, jint, jint); + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType; jint derivationMethod; jint finality; jboolean isAbstract; diff --git a/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h b/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h index 0233bfc095a..67e7d863e1e 100644 --- a/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h +++ b/libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h @@ -31,7 +31,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -43,15 +43,15 @@ class gnu::xml::validation::xmlschema::ElementDeclaration : public ::java::lang: { public: // actually package-private - ElementDeclaration(::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace::QName *, jint, jint, jboolean); - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; + ElementDeclaration(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace$::QName *, jint, jint, jboolean); + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name; ::gnu::xml::validation::datatype::Type * datatype; jint scope; ::gnu::xml::validation::xmlschema::ElementDeclaration * parent; jint type; ::java::lang::String * value; jboolean nillable; - ::javax::xml::namespace::QName * substitutionGroup; + ::javax::xml::namespace$::QName * substitutionGroup; jint substitutionGroupExclusions; jint disallowedSubstitutions; jboolean isAbstract; diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h index 2d208afd61f..ed1bc80dc08 100644 --- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h +++ b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h @@ -36,7 +36,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -77,7 +77,7 @@ public: // actually package-private virtual jint parseComplexTypeBlockSet(::java::lang::String *); virtual ::java::lang::Object * parseElement(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *); virtual ::java::lang::Integer * getOccurrence(::java::lang::String *); - virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace::QName *); + virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace$::QName *); virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::org::w3c::dom::Node *); virtual ::gnu::xml::validation::datatype::Type * parseComplexType(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *); virtual void parseSimpleContent(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *); @@ -87,7 +87,7 @@ public: // actually package-private virtual ::gnu::xml::validation::datatype::Annotation * parseAnnotation(::org::w3c::dom::Node *); private: static ::java::lang::String * getAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *); - static ::javax::xml::namespace::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *); + static ::javax::xml::namespace$::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *); public: // actually package-private ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::java::lang::Object)))) schema; ::org::relaxng::datatype::DatatypeLibrary * typeLibrary; diff --git a/libjava/gnu/xml/xpath/AndExpr.h b/libjava/gnu/xml/xpath/AndExpr.h index 69c310d3779..dd57695fc5b 100644 --- a/libjava/gnu/xml/xpath/AndExpr.h +++ b/libjava/gnu/xml/xpath/AndExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ public: AndExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs; diff --git a/libjava/gnu/xml/xpath/ArithmeticExpr.h b/libjava/gnu/xml/xpath/ArithmeticExpr.h index eb7773b8ba5..586ff4a323e 100644 --- a/libjava/gnu/xml/xpath/ArithmeticExpr.h +++ b/libjava/gnu/xml/xpath/ArithmeticExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private static const jint ADD = 0; diff --git a/libjava/gnu/xml/xpath/BooleanFunction.h b/libjava/gnu/xml/xpath/BooleanFunction.h index ab54f6cd728..7688d9e02cf 100644 --- a/libjava/gnu/xml/xpath/BooleanFunction.h +++ b/libjava/gnu/xml/xpath/BooleanFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/CeilingFunction.h b/libjava/gnu/xml/xpath/CeilingFunction.h index 4350f310987..368ff4a62dd 100644 --- a/libjava/gnu/xml/xpath/CeilingFunction.h +++ b/libjava/gnu/xml/xpath/CeilingFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/ConcatFunction.h b/libjava/gnu/xml/xpath/ConcatFunction.h index 492cb12b0c5..db115180b07 100644 --- a/libjava/gnu/xml/xpath/ConcatFunction.h +++ b/libjava/gnu/xml/xpath/ConcatFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) args; diff --git a/libjava/gnu/xml/xpath/Constant.h b/libjava/gnu/xml/xpath/Constant.h index 51e14fed2e7..c957b37c347 100644 --- a/libjava/gnu/xml/xpath/Constant.h +++ b/libjava/gnu/xml/xpath/Constant.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ public: Constant(::java::lang::Object *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::java::lang::Object * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) value; diff --git a/libjava/gnu/xml/xpath/ContainsFunction.h b/libjava/gnu/xml/xpath/ContainsFunction.h index e33d07f995d..a426db1c2e6 100644 --- a/libjava/gnu/xml/xpath/ContainsFunction.h +++ b/libjava/gnu/xml/xpath/ContainsFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1; diff --git a/libjava/gnu/xml/xpath/CountFunction.h b/libjava/gnu/xml/xpath/CountFunction.h index 0741837949f..353380e3ecc 100644 --- a/libjava/gnu/xml/xpath/CountFunction.h +++ b/libjava/gnu/xml/xpath/CountFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/EqualityExpr.h b/libjava/gnu/xml/xpath/EqualityExpr.h index af6c0e29088..dbf51f7b08c 100644 --- a/libjava/gnu/xml/xpath/EqualityExpr.h +++ b/libjava/gnu/xml/xpath/EqualityExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,7 +53,7 @@ private: jboolean evaluateImpl(::org::w3c::dom::Node *, jint, jint); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs; diff --git a/libjava/gnu/xml/xpath/Expr.h b/libjava/gnu/xml/xpath/Expr.h index a737f95a51a..ee88cc05227 100644 --- a/libjava/gnu/xml/xpath/Expr.h +++ b/libjava/gnu/xml/xpath/Expr.h @@ -30,7 +30,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -60,13 +60,13 @@ class gnu::xml::xpath::Expr : public ::java::lang::Object public: Expr(); - virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace::QName *); + virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *); virtual ::java::lang::String * evaluate(::java::lang::Object *); - virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *); + virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *); virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *); virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint) = 0; virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *) = 0; - virtual jboolean references(::javax::xml::namespace::QName *) = 0; + virtual jboolean references(::javax::xml::namespace$::QName *) = 0; static ::java::util::Collection * _id(::org::w3c::dom::Node *, ::java::lang::Object *); static ::java::lang::String * _local_name(::org::w3c::dom::Node *, ::java::util::Collection *); static ::java::lang::String * _namespace_uri(::org::w3c::dom::Node *, ::java::util::Collection *); diff --git a/libjava/gnu/xml/xpath/FalseFunction.h b/libjava/gnu/xml/xpath/FalseFunction.h index 42df32629c1..22447e5edc4 100644 --- a/libjava/gnu/xml/xpath/FalseFunction.h +++ b/libjava/gnu/xml/xpath/FalseFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/FloorFunction.h b/libjava/gnu/xml/xpath/FloorFunction.h index 1fe02545e71..a3634d6731d 100644 --- a/libjava/gnu/xml/xpath/FloorFunction.h +++ b/libjava/gnu/xml/xpath/FloorFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/FunctionCall.h b/libjava/gnu/xml/xpath/FunctionCall.h index 09a4184405f..6039022f5e2 100644 --- a/libjava/gnu/xml/xpath/FunctionCall.h +++ b/libjava/gnu/xml/xpath/FunctionCall.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -54,7 +54,7 @@ public: FunctionCall(::javax::xml::xpath::XPathFunctionResolver *, ::java::lang::String *, ::java::util::List *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::javax::xml::xpath::XPathFunctionResolver * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) resolver; diff --git a/libjava/gnu/xml/xpath/IdFunction.h b/libjava/gnu/xml/xpath/IdFunction.h index efe1f3e543c..a5fbc14c845 100644 --- a/libjava/gnu/xml/xpath/IdFunction.h +++ b/libjava/gnu/xml/xpath/IdFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -52,7 +52,7 @@ public: jboolean matches(::org::w3c::dom::Node *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) arg; diff --git a/libjava/gnu/xml/xpath/LangFunction.h b/libjava/gnu/xml/xpath/LangFunction.h index d9c2123ff51..cf7bd65fe65 100644 --- a/libjava/gnu/xml/xpath/LangFunction.h +++ b/libjava/gnu/xml/xpath/LangFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -54,7 +54,7 @@ public: // actually package-private ::java::lang::String * getLang(::org::w3c::dom::Node *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/LastFunction.h b/libjava/gnu/xml/xpath/LastFunction.h index 3af5ef634e7..f20cf55c4f6 100644 --- a/libjava/gnu/xml/xpath/LastFunction.h +++ b/libjava/gnu/xml/xpath/LastFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/LocalNameFunction.h b/libjava/gnu/xml/xpath/LocalNameFunction.h index 3de7c9a8658..2743e172624 100644 --- a/libjava/gnu/xml/xpath/LocalNameFunction.h +++ b/libjava/gnu/xml/xpath/LocalNameFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/NameFunction.h b/libjava/gnu/xml/xpath/NameFunction.h index b321cc2ba38..4e9db9a4fc8 100644 --- a/libjava/gnu/xml/xpath/NameFunction.h +++ b/libjava/gnu/xml/xpath/NameFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/NameTest.h b/libjava/gnu/xml/xpath/NameTest.h index d81cf5f5166..823ea6be1dd 100644 --- a/libjava/gnu/xml/xpath/NameTest.h +++ b/libjava/gnu/xml/xpath/NameTest.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -46,7 +46,7 @@ class gnu::xml::xpath::NameTest : public ::gnu::xml::xpath::Test { public: - NameTest(::javax::xml::namespace::QName *, jboolean, jboolean); + NameTest(::javax::xml::namespace$::QName *, jboolean, jboolean); jboolean matchesAny(); jboolean matchesAnyLocalName(); jboolean matches(::org::w3c::dom::Node *, jint, jint); @@ -55,10 +55,10 @@ public: // actually package-private static jboolean equal(::java::lang::String *, ::java::lang::String *); public: ::gnu::xml::xpath::Test * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName; jboolean anyLocalName; jboolean any; public: diff --git a/libjava/gnu/xml/xpath/NamespaceTest.h b/libjava/gnu/xml/xpath/NamespaceTest.h index 584a538e1ae..55095195aa3 100644 --- a/libjava/gnu/xml/xpath/NamespaceTest.h +++ b/libjava/gnu/xml/xpath/NamespaceTest.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -46,15 +46,15 @@ class gnu::xml::xpath::NamespaceTest : public ::gnu::xml::xpath::Test { public: - NamespaceTest(::javax::xml::namespace::QName *, jboolean, jboolean); + NamespaceTest(::javax::xml::namespace$::QName *, jboolean, jboolean); jboolean matchesAny(); jboolean matchesAnyLocalName(); jboolean matches(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Test * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) qName; jboolean anyLocalName; jboolean any; public: diff --git a/libjava/gnu/xml/xpath/NamespaceUriFunction.h b/libjava/gnu/xml/xpath/NamespaceUriFunction.h index 0838222b03f..76e04604577 100644 --- a/libjava/gnu/xml/xpath/NamespaceUriFunction.h +++ b/libjava/gnu/xml/xpath/NamespaceUriFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/NegativeExpr.h b/libjava/gnu/xml/xpath/NegativeExpr.h index bc4a176f521..21b9322636d 100644 --- a/libjava/gnu/xml/xpath/NegativeExpr.h +++ b/libjava/gnu/xml/xpath/NegativeExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) expr; diff --git a/libjava/gnu/xml/xpath/NodeTypeTest.h b/libjava/gnu/xml/xpath/NodeTypeTest.h index 952aee4fc9b..da631d9296e 100644 --- a/libjava/gnu/xml/xpath/NodeTypeTest.h +++ b/libjava/gnu/xml/xpath/NodeTypeTest.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -52,7 +52,7 @@ public: ::java::lang::String * getData(); jboolean matches(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Test * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private jshort __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) type; diff --git a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h index 6637aec97de..ade9d2caa81 100644 --- a/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h +++ b/libjava/gnu/xml/xpath/NormalizeSpaceFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/NotFunction.h b/libjava/gnu/xml/xpath/NotFunction.h index 117055bfe2a..c2f7499673d 100644 --- a/libjava/gnu/xml/xpath/NotFunction.h +++ b/libjava/gnu/xml/xpath/NotFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/NumberFunction.h b/libjava/gnu/xml/xpath/NumberFunction.h index bdbeafe65ec..92937fdb15f 100644 --- a/libjava/gnu/xml/xpath/NumberFunction.h +++ b/libjava/gnu/xml/xpath/NumberFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/OrExpr.h b/libjava/gnu/xml/xpath/OrExpr.h index 8296fc686b6..9cd5f9594bb 100644 --- a/libjava/gnu/xml/xpath/OrExpr.h +++ b/libjava/gnu/xml/xpath/OrExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -49,7 +49,7 @@ public: OrExpr(::gnu::xml::xpath::Expr *, ::gnu::xml::xpath::Expr *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs; diff --git a/libjava/gnu/xml/xpath/ParenthesizedExpr.h b/libjava/gnu/xml/xpath/ParenthesizedExpr.h index 09a5efaeb5f..3a228ade884 100644 --- a/libjava/gnu/xml/xpath/ParenthesizedExpr.h +++ b/libjava/gnu/xml/xpath/ParenthesizedExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) expr; diff --git a/libjava/gnu/xml/xpath/PositionFunction.h b/libjava/gnu/xml/xpath/PositionFunction.h index 4a06fb03a01..849f9c7495f 100644 --- a/libjava/gnu/xml/xpath/PositionFunction.h +++ b/libjava/gnu/xml/xpath/PositionFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/Predicate.h b/libjava/gnu/xml/xpath/Predicate.h index da2df353f89..d51d05926b0 100644 --- a/libjava/gnu/xml/xpath/Predicate.h +++ b/libjava/gnu/xml/xpath/Predicate.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: virtual jboolean matches(::org::w3c::dom::Node *, jint, jint); virtual ::gnu::xml::xpath::Test * clone(::java::lang::Object *); - virtual jboolean references(::javax::xml::namespace::QName *); + virtual jboolean references(::javax::xml::namespace$::QName *); virtual ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Test)))) expr; diff --git a/libjava/gnu/xml/xpath/RelationalExpr.h b/libjava/gnu/xml/xpath/RelationalExpr.h index 727282e642c..3decec0dd29 100644 --- a/libjava/gnu/xml/xpath/RelationalExpr.h +++ b/libjava/gnu/xml/xpath/RelationalExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) lhs; diff --git a/libjava/gnu/xml/xpath/Root.h b/libjava/gnu/xml/xpath/Root.h index 3988c14deb7..37ce921fd60 100644 --- a/libjava/gnu/xml/xpath/Root.h +++ b/libjava/gnu/xml/xpath/Root.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,7 +53,7 @@ public: // actually package-private ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/RoundFunction.h b/libjava/gnu/xml/xpath/RoundFunction.h index 6568dc13290..97dbf14ab39 100644 --- a/libjava/gnu/xml/xpath/RoundFunction.h +++ b/libjava/gnu/xml/xpath/RoundFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/Selector.h b/libjava/gnu/xml/xpath/Selector.h index 8b0495ff69b..9dcd37a4e3f 100644 --- a/libjava/gnu/xml/xpath/Selector.h +++ b/libjava/gnu/xml/xpath/Selector.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -72,7 +72,7 @@ public: // actually package-private jboolean isNamespaceAttribute(::org::w3c::dom::Node *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); static const jint ANCESTOR = 0; static const jint ANCESTOR_OR_SELF = 1; diff --git a/libjava/gnu/xml/xpath/StartsWithFunction.h b/libjava/gnu/xml/xpath/StartsWithFunction.h index 34b5ff12922..c3900e4a475 100644 --- a/libjava/gnu/xml/xpath/StartsWithFunction.h +++ b/libjava/gnu/xml/xpath/StartsWithFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1; diff --git a/libjava/gnu/xml/xpath/Steps.h b/libjava/gnu/xml/xpath/Steps.h index f2802895675..db4260555d3 100644 --- a/libjava/gnu/xml/xpath/Steps.h +++ b/libjava/gnu/xml/xpath/Steps.h @@ -25,7 +25,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -61,7 +61,7 @@ public: // actually package-private ::java::util::Collection * evaluate(::org::w3c::dom::Node *, ::java::util::Collection *); public: ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Path)))) path; diff --git a/libjava/gnu/xml/xpath/StringFunction.h b/libjava/gnu/xml/xpath/StringFunction.h index 0e2e907e7be..0f96aa2d894 100644 --- a/libjava/gnu/xml/xpath/StringFunction.h +++ b/libjava/gnu/xml/xpath/StringFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/StringLengthFunction.h b/libjava/gnu/xml/xpath/StringLengthFunction.h index a181d292343..92f7ce14a48 100644 --- a/libjava/gnu/xml/xpath/StringLengthFunction.h +++ b/libjava/gnu/xml/xpath/StringLengthFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/SubstringAfterFunction.h b/libjava/gnu/xml/xpath/SubstringAfterFunction.h index 4c89a7c072d..fa9fed3b380 100644 --- a/libjava/gnu/xml/xpath/SubstringAfterFunction.h +++ b/libjava/gnu/xml/xpath/SubstringAfterFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1; diff --git a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h b/libjava/gnu/xml/xpath/SubstringBeforeFunction.h index 97d2fd0de11..f8056be5bb8 100644 --- a/libjava/gnu/xml/xpath/SubstringBeforeFunction.h +++ b/libjava/gnu/xml/xpath/SubstringBeforeFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1; diff --git a/libjava/gnu/xml/xpath/SubstringFunction.h b/libjava/gnu/xml/xpath/SubstringFunction.h index 51a3d052c65..d56e1b9da80 100644 --- a/libjava/gnu/xml/xpath/SubstringFunction.h +++ b/libjava/gnu/xml/xpath/SubstringFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1; diff --git a/libjava/gnu/xml/xpath/SumFunction.h b/libjava/gnu/xml/xpath/SumFunction.h index aeb7e163df6..3a7b6e043a8 100644 --- a/libjava/gnu/xml/xpath/SumFunction.h +++ b/libjava/gnu/xml/xpath/SumFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; diff --git a/libjava/gnu/xml/xpath/Test.h b/libjava/gnu/xml/xpath/Test.h index 2e5f77f3543..64510e85fc3 100644 --- a/libjava/gnu/xml/xpath/Test.h +++ b/libjava/gnu/xml/xpath/Test.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -48,7 +48,7 @@ public: Test(); virtual jboolean matches(::org::w3c::dom::Node *, jint, jint) = 0; virtual ::gnu::xml::xpath::Test * clone(::java::lang::Object *) = 0; - virtual jboolean references(::javax::xml::namespace::QName *) = 0; + virtual jboolean references(::javax::xml::namespace$::QName *) = 0; static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/TranslateFunction.h b/libjava/gnu/xml/xpath/TranslateFunction.h index b2a708a19fa..b1e168058d2 100644 --- a/libjava/gnu/xml/xpath/TranslateFunction.h +++ b/libjava/gnu/xml/xpath/TranslateFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg1; diff --git a/libjava/gnu/xml/xpath/TrueFunction.h b/libjava/gnu/xml/xpath/TrueFunction.h index a5958170cb5..27e42ddbaa6 100644 --- a/libjava/gnu/xml/xpath/TrueFunction.h +++ b/libjava/gnu/xml/xpath/TrueFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/UnionExpr.h b/libjava/gnu/xml/xpath/UnionExpr.h index 1186ee27c6a..bbac92a822d 100644 --- a/libjava/gnu/xml/xpath/UnionExpr.h +++ b/libjava/gnu/xml/xpath/UnionExpr.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: jboolean matches(::org::w3c::dom::Node *); ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Pattern)))) lhs; diff --git a/libjava/gnu/xml/xpath/VariableReference.h b/libjava/gnu/xml/xpath/VariableReference.h index c1a611c55d6..ea5c1a6e889 100644 --- a/libjava/gnu/xml/xpath/VariableReference.h +++ b/libjava/gnu/xml/xpath/VariableReference.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,14 +50,14 @@ class gnu::xml::xpath::VariableReference : public ::gnu::xml::xpath::Expr { public: - VariableReference(::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::namespace::QName *); + VariableReference(::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::namespace$::QName *); virtual ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); virtual ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - virtual jboolean references(::javax::xml::namespace::QName *); + virtual jboolean references(::javax::xml::namespace$::QName *); virtual ::java::lang::String * toString(); public: // actually package-private ::javax::xml::xpath::XPathVariableResolver * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) resolver; - ::javax::xml::namespace::QName * name; + ::javax::xml::namespace$::QName * name; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/xml/xpath/XPathImpl.h b/libjava/gnu/xml/xpath/XPathImpl.h index 1f84db72175..f1bc5a36576 100644 --- a/libjava/gnu/xml/xpath/XPathImpl.h +++ b/libjava/gnu/xml/xpath/XPathImpl.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -53,23 +53,23 @@ class gnu::xml::xpath::XPathImpl : public ::java::lang::Object { public: // actually package-private - XPathImpl(::javax::xml::namespace::NamespaceContext *, ::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::xpath::XPathFunctionResolver *); + XPathImpl(::javax::xml::namespace$::NamespaceContext *, ::javax::xml::xpath::XPathVariableResolver *, ::javax::xml::xpath::XPathFunctionResolver *); public: virtual void reset(); virtual void setXPathVariableResolver(::javax::xml::xpath::XPathVariableResolver *); virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver(); virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *); virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver(); - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *); - virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace::QName *); + virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *); virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *); - virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *); + virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *); virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *); public: // actually package-private ::gnu::xml::xpath::XPathParser * __attribute__((aligned(__alignof__( ::java::lang::Object)))) parser; - ::javax::xml::namespace::NamespaceContext * namespaceContext; + ::javax::xml::namespace$::NamespaceContext * namespaceContext; ::javax::xml::xpath::XPathVariableResolver * variableResolver; ::javax::xml::xpath::XPathFunctionResolver * functionResolver; public: diff --git a/libjava/gnu/xml/xpath/XPathParser.h b/libjava/gnu/xml/xpath/XPathParser.h index 13c48744ff1..0133a04512d 100644 --- a/libjava/gnu/xml/xpath/XPathParser.h +++ b/libjava/gnu/xml/xpath/XPathParser.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -47,7 +47,7 @@ class gnu::xml::xpath::XPathParser : public ::java::lang::Object public: XPathParser(); public: // actually package-private - virtual ::javax::xml::namespace::QName * getQName(::java::lang::String *); + virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *); virtual ::gnu::xml::xpath::Expr * lookupFunction(::java::lang::String *, ::java::util::List *); public: virtual void yyerror(::java::lang::String *); @@ -61,7 +61,7 @@ public: // actually protected public: virtual ::java::lang::Object * yyparse(::gnu::xml::xpath::XPathParser$yyInput *); public: // actually package-private - ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext; + ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext; ::javax::xml::xpath::XPathVariableResolver * variableResolver; ::javax::xml::xpath::XPathFunctionResolver * functionResolver; public: diff --git a/libjava/javax/xml/datatype/DatatypeConstants.h b/libjava/javax/xml/datatype/DatatypeConstants.h index 721cb1b8589..37c0c0445e8 100644 --- a/libjava/javax/xml/datatype/DatatypeConstants.h +++ b/libjava/javax/xml/datatype/DatatypeConstants.h @@ -18,7 +18,7 @@ extern "Java" class DatatypeConstants; class DatatypeConstants$Field; } - namespace namespace + namespace namespace$ { class QName; } @@ -54,17 +54,17 @@ public: static ::javax::xml::datatype::DatatypeConstants$Field * HOURS; static ::javax::xml::datatype::DatatypeConstants$Field * MINUTES; static ::javax::xml::datatype::DatatypeConstants$Field * SECONDS; - static ::javax::xml::namespace::QName * DATETIME; - static ::javax::xml::namespace::QName * TIME; - static ::javax::xml::namespace::QName * DATE; - static ::javax::xml::namespace::QName * GYEARMONTH; - static ::javax::xml::namespace::QName * GMONTHDAY; - static ::javax::xml::namespace::QName * GYEAR; - static ::javax::xml::namespace::QName * GMONTH; - static ::javax::xml::namespace::QName * GDAY; - static ::javax::xml::namespace::QName * DURATION; - static ::javax::xml::namespace::QName * DURATION_DAYTIME; - static ::javax::xml::namespace::QName * DURATION_YEARMONTH; + static ::javax::xml::namespace$::QName * DATETIME; + static ::javax::xml::namespace$::QName * TIME; + static ::javax::xml::namespace$::QName * DATE; + static ::javax::xml::namespace$::QName * GYEARMONTH; + static ::javax::xml::namespace$::QName * GMONTHDAY; + static ::javax::xml::namespace$::QName * GYEAR; + static ::javax::xml::namespace$::QName * GMONTH; + static ::javax::xml::namespace$::QName * GDAY; + static ::javax::xml::namespace$::QName * DURATION; + static ::javax::xml::namespace$::QName * DURATION_DAYTIME; + static ::javax::xml::namespace$::QName * DURATION_YEARMONTH; static const jint MAX_TIMEZONE_OFFSET = -840; static const jint MIN_TIMEZONE_OFFSET = 840; static ::java::lang::Class class$; diff --git a/libjava/javax/xml/datatype/Duration.h b/libjava/javax/xml/datatype/Duration.h index 719abd088b8..84f9782b254 100644 --- a/libjava/javax/xml/datatype/Duration.h +++ b/libjava/javax/xml/datatype/Duration.h @@ -25,7 +25,7 @@ extern "Java" class DatatypeConstants$Field; class Duration; } - namespace namespace + namespace namespace$ { class QName; } @@ -38,7 +38,7 @@ class javax::xml::datatype::Duration : public ::java::lang::Object public: Duration(); - virtual ::javax::xml::namespace::QName * getXMLSchemaType(); + virtual ::javax::xml::namespace$::QName * getXMLSchemaType(); virtual jint getSign() = 0; virtual jint getYears(); virtual jint getMonths(); diff --git a/libjava/javax/xml/datatype/XMLGregorianCalendar.h b/libjava/javax/xml/datatype/XMLGregorianCalendar.h index 6e9c92bf24b..eda668f54e8 100644 --- a/libjava/javax/xml/datatype/XMLGregorianCalendar.h +++ b/libjava/javax/xml/datatype/XMLGregorianCalendar.h @@ -26,7 +26,7 @@ extern "Java" class Duration; class XMLGregorianCalendar; } - namespace namespace + namespace namespace$ { class QName; } @@ -70,7 +70,7 @@ public: virtual jboolean equals(::java::lang::Object *); virtual jint hashCode(); virtual ::java::lang::String * toXMLFormat() = 0; - virtual ::javax::xml::namespace::QName * getXMLSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getXMLSchemaType() = 0; virtual ::java::lang::String * toString(); virtual jboolean isValid() = 0; virtual void add(::javax::xml::datatype::Duration *) = 0; diff --git a/libjava/javax/xml/namespace/NamespaceContext.h b/libjava/javax/xml/namespace/NamespaceContext.h index 4db8a067eab..d0fd3410940 100644 --- a/libjava/javax/xml/namespace/NamespaceContext.h +++ b/libjava/javax/xml/namespace/NamespaceContext.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; } @@ -21,7 +21,7 @@ extern "Java" } } -class javax::xml::namespace::NamespaceContext : public ::java::lang::Object +class javax::xml::namespace$::NamespaceContext : public ::java::lang::Object { public: diff --git a/libjava/javax/xml/namespace/QName.h b/libjava/javax/xml/namespace/QName.h index b299f64fe01..a352b7cea8a 100644 --- a/libjava/javax/xml/namespace/QName.h +++ b/libjava/javax/xml/namespace/QName.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -21,7 +21,7 @@ extern "Java" } } -class javax::xml::namespace::QName : public ::java::lang::Object +class javax::xml::namespace$::QName : public ::java::lang::Object { public: @@ -34,7 +34,7 @@ public: virtual jboolean equals(::java::lang::Object *); virtual jint hashCode(); virtual ::java::lang::String * toString(); - static ::javax::xml::namespace::QName * valueOf(::java::lang::String *); + static ::javax::xml::namespace$::QName * valueOf(::java::lang::String *); private: static const jlong serialVersionUID = 4418622981026545151LL; ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceURI; diff --git a/libjava/javax/xml/stream/XMLEventFactory.h b/libjava/javax/xml/stream/XMLEventFactory.h index 8c8e4fe29c6..493ceef3db1 100644 --- a/libjava/javax/xml/stream/XMLEventFactory.h +++ b/libjava/javax/xml/stream/XMLEventFactory.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -57,14 +57,14 @@ public: virtual void setLocation(::javax::xml::stream::Location *) = 0; virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0; virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *) = 0; - virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace::QName *, ::java::lang::String *) = 0; + virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *) = 0; virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *) = 0; virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *) = 0; - virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0; + virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0; virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0; virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *) = 0; - virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace::NamespaceContext *) = 0; - virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace::QName *, ::java::util::Iterator *) = 0; + virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace$::NamespaceContext *) = 0; + virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *) = 0; virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0; virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *) = 0; virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *) = 0; diff --git a/libjava/javax/xml/stream/XMLEventWriter.h b/libjava/javax/xml/stream/XMLEventWriter.h index 7762e629b4b..9ed0aa1df47 100644 --- a/libjava/javax/xml/stream/XMLEventWriter.h +++ b/libjava/javax/xml/stream/XMLEventWriter.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; } @@ -41,8 +41,8 @@ public: virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0; virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0; virtual void setDefaultNamespace(::java::lang::String *) = 0; - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0; - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0; + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0; + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/XMLStreamReader.h b/libjava/javax/xml/stream/XMLStreamReader.h index b0632932093..47b49b40814 100644 --- a/libjava/javax/xml/stream/XMLStreamReader.h +++ b/libjava/javax/xml/stream/XMLStreamReader.h @@ -15,7 +15,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -47,7 +47,7 @@ public: virtual jboolean isWhiteSpace() = 0; virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *) = 0; virtual jint getAttributeCount() = 0; - virtual ::javax::xml::namespace::QName * getAttributeName(jint) = 0; + virtual ::javax::xml::namespace$::QName * getAttributeName(jint) = 0; virtual ::java::lang::String * getAttributeNamespace(jint) = 0; virtual ::java::lang::String * getAttributeLocalName(jint) = 0; virtual ::java::lang::String * getAttributePrefix(jint) = 0; @@ -57,7 +57,7 @@ public: virtual jint getNamespaceCount() = 0; virtual ::java::lang::String * getNamespacePrefix(jint) = 0; virtual ::java::lang::String * getNamespaceURI(jint) = 0; - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0; + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0; virtual jint getEventType() = 0; virtual ::java::lang::String * getText() = 0; virtual JArray< jchar > * getTextCharacters() = 0; @@ -67,7 +67,7 @@ public: virtual ::java::lang::String * getEncoding() = 0; virtual jboolean hasText() = 0; virtual ::javax::xml::stream::Location * getLocation() = 0; - virtual ::javax::xml::namespace::QName * getName() = 0; + virtual ::javax::xml::namespace$::QName * getName() = 0; virtual ::java::lang::String * getLocalName() = 0; virtual jboolean hasName() = 0; virtual ::java::lang::String * getNamespaceURI() = 0; diff --git a/libjava/javax/xml/stream/XMLStreamWriter.h b/libjava/javax/xml/stream/XMLStreamWriter.h index 74230ca7c82..e4bed463c00 100644 --- a/libjava/javax/xml/stream/XMLStreamWriter.h +++ b/libjava/javax/xml/stream/XMLStreamWriter.h @@ -15,7 +15,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; } @@ -60,8 +60,8 @@ public: virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0; virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0; virtual void setDefaultNamespace(::java::lang::String *) = 0; - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0; - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0; + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0; + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0; virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/Attribute.h b/libjava/javax/xml/stream/events/Attribute.h index f0e057063be..d4e42b5a5f2 100644 --- a/libjava/javax/xml/stream/events/Attribute.h +++ b/libjava/javax/xml/stream/events/Attribute.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -36,7 +36,7 @@ class javax::xml::stream::events::Attribute : public ::java::lang::Object { public: - virtual ::javax::xml::namespace::QName * getName() = 0; + virtual ::javax::xml::namespace$::QName * getName() = 0; virtual ::java::lang::String * getValue() = 0; virtual ::java::lang::String * getDTDType() = 0; virtual jboolean isSpecified() = 0; @@ -54,7 +54,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/Characters.h b/libjava/javax/xml/stream/events/Characters.h index f1511881f0e..539d45f3cd9 100644 --- a/libjava/javax/xml/stream/events/Characters.h +++ b/libjava/javax/xml/stream/events/Characters.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,7 +53,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/Comment.h b/libjava/javax/xml/stream/events/Comment.h index 1f945ea19fc..ba81b85a845 100644 --- a/libjava/javax/xml/stream/events/Comment.h +++ b/libjava/javax/xml/stream/events/Comment.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/DTD.h b/libjava/javax/xml/stream/events/DTD.h index daaa23fa124..2932d6871f4 100644 --- a/libjava/javax/xml/stream/events/DTD.h +++ b/libjava/javax/xml/stream/events/DTD.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -54,7 +54,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/EndDocument.h b/libjava/javax/xml/stream/events/EndDocument.h index 984585490bd..e3cdc98db26 100644 --- a/libjava/javax/xml/stream/events/EndDocument.h +++ b/libjava/javax/xml/stream/events/EndDocument.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/EndElement.h b/libjava/javax/xml/stream/events/EndElement.h index 86825d6e463..b67f2bb183d 100644 --- a/libjava/javax/xml/stream/events/EndElement.h +++ b/libjava/javax/xml/stream/events/EndElement.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -35,7 +35,7 @@ class javax::xml::stream::events::EndElement : public ::java::lang::Object { public: - virtual ::javax::xml::namespace::QName * getName() = 0; + virtual ::javax::xml::namespace$::QName * getName() = 0; virtual ::java::util::Iterator * getNamespaces() = 0; virtual jint getEventType() = 0; virtual ::javax::xml::stream::Location * getLocation() = 0; @@ -51,7 +51,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/EntityDeclaration.h b/libjava/javax/xml/stream/events/EntityDeclaration.h index 98eda7a3ea5..f4075edc44a 100644 --- a/libjava/javax/xml/stream/events/EntityDeclaration.h +++ b/libjava/javax/xml/stream/events/EntityDeclaration.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -56,7 +56,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/EntityReference.h b/libjava/javax/xml/stream/events/EntityReference.h index ba95d54584b..548bbc6b335 100644 --- a/libjava/javax/xml/stream/events/EntityReference.h +++ b/libjava/javax/xml/stream/events/EntityReference.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,7 +53,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/Namespace.h b/libjava/javax/xml/stream/events/Namespace.h index 5690c2305dc..470b22bc46c 100644 --- a/libjava/javax/xml/stream/events/Namespace.h +++ b/libjava/javax/xml/stream/events/Namespace.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,7 +53,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/NotationDeclaration.h b/libjava/javax/xml/stream/events/NotationDeclaration.h index e5c6ba0183a..c60a79ebc52 100644 --- a/libjava/javax/xml/stream/events/NotationDeclaration.h +++ b/libjava/javax/xml/stream/events/NotationDeclaration.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -53,7 +53,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/ProcessingInstruction.h b/libjava/javax/xml/stream/events/ProcessingInstruction.h index 3a5f9944fa6..79f969d6985 100644 --- a/libjava/javax/xml/stream/events/ProcessingInstruction.h +++ b/libjava/javax/xml/stream/events/ProcessingInstruction.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -52,7 +52,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/StartDocument.h b/libjava/javax/xml/stream/events/StartDocument.h index 2658939a791..112e600316e 100644 --- a/libjava/javax/xml/stream/events/StartDocument.h +++ b/libjava/javax/xml/stream/events/StartDocument.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -56,7 +56,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/StartElement.h b/libjava/javax/xml/stream/events/StartElement.h index 0695267421d..2dd50e6c87c 100644 --- a/libjava/javax/xml/stream/events/StartElement.h +++ b/libjava/javax/xml/stream/events/StartElement.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -37,11 +37,11 @@ class javax::xml::stream::events::StartElement : public ::java::lang::Object { public: - virtual ::javax::xml::namespace::QName * getName() = 0; + virtual ::javax::xml::namespace$::QName * getName() = 0; virtual ::java::util::Iterator * getAttributes() = 0; virtual ::java::util::Iterator * getNamespaces() = 0; - virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *) = 0; - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0; + virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *) = 0; + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0; virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0; virtual jint getEventType() = 0; virtual ::javax::xml::stream::Location * getLocation() = 0; @@ -57,7 +57,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/events/XMLEvent.h b/libjava/javax/xml/stream/events/XMLEvent.h index 54d775d41e0..837f2a89474 100644 --- a/libjava/javax/xml/stream/events/XMLEvent.h +++ b/libjava/javax/xml/stream/events/XMLEvent.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -50,7 +50,7 @@ public: virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0; virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0; virtual ::javax::xml::stream::events::Characters * asCharacters() = 0; - virtual ::javax::xml::namespace::QName * getSchemaType() = 0; + virtual ::javax::xml::namespace$::QName * getSchemaType() = 0; virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/stream/util/ReaderDelegate.h b/libjava/javax/xml/stream/util/ReaderDelegate.h index 4235d0dcd14..0a887d1ee9a 100644 --- a/libjava/javax/xml/stream/util/ReaderDelegate.h +++ b/libjava/javax/xml/stream/util/ReaderDelegate.h @@ -15,7 +15,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -48,14 +48,14 @@ public: virtual jboolean hasNext(); virtual void close(); virtual ::java::lang::String * getNamespaceURI(::java::lang::String *); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); virtual jboolean isStartElement(); virtual jboolean isEndElement(); virtual jboolean isCharacters(); virtual jboolean isWhiteSpace(); virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *); virtual jint getAttributeCount(); - virtual ::javax::xml::namespace::QName * getAttributeName(jint); + virtual ::javax::xml::namespace$::QName * getAttributeName(jint); virtual ::java::lang::String * getAttributePrefix(jint); virtual ::java::lang::String * getAttributeNamespace(jint); virtual ::java::lang::String * getAttributeLocalName(jint); @@ -74,7 +74,7 @@ public: virtual ::java::lang::String * getEncoding(); virtual jboolean hasText(); virtual ::javax::xml::stream::Location * getLocation(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual ::java::lang::String * getLocalName(); virtual jboolean hasName(); virtual ::java::lang::String * getNamespaceURI(); diff --git a/libjava/javax/xml/xpath/XPath.h b/libjava/javax/xml/xpath/XPath.h index 0a67abb8129..a19cd75432d 100644 --- a/libjava/javax/xml/xpath/XPath.h +++ b/libjava/javax/xml/xpath/XPath.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -48,12 +48,12 @@ public: virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver() = 0; virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0; virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver() = 0; - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0; - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0; + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0; + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0; virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *) = 0; - virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *) = 0; - virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/xpath/XPathConstants.h b/libjava/javax/xml/xpath/XPathConstants.h index 0b15648e34e..5cb800ce46e 100644 --- a/libjava/javax/xml/xpath/XPathConstants.h +++ b/libjava/javax/xml/xpath/XPathConstants.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -30,11 +30,11 @@ class javax::xml::xpath::XPathConstants : public ::java::lang::Object XPathConstants(); public: - static ::javax::xml::namespace::QName * NUMBER; - static ::javax::xml::namespace::QName * STRING; - static ::javax::xml::namespace::QName * BOOLEAN; - static ::javax::xml::namespace::QName * NODESET; - static ::javax::xml::namespace::QName * NODE; + static ::javax::xml::namespace$::QName * NUMBER; + static ::javax::xml::namespace$::QName * STRING; + static ::javax::xml::namespace$::QName * BOOLEAN; + static ::javax::xml::namespace$::QName * NODESET; + static ::javax::xml::namespace$::QName * NODE; static ::java::lang::String * DOM_OBJECT_MODEL; static ::java::lang::Class class$; }; diff --git a/libjava/javax/xml/xpath/XPathExpression.h b/libjava/javax/xml/xpath/XPathExpression.h index 6a9a0e3e5a2..389e5f69d9a 100644 --- a/libjava/javax/xml/xpath/XPathExpression.h +++ b/libjava/javax/xml/xpath/XPathExpression.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -39,9 +39,9 @@ class javax::xml::xpath::XPathExpression : public ::java::lang::Object { public: - virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::java::lang::Object *) = 0; - virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/xpath/XPathFunctionResolver.h b/libjava/javax/xml/xpath/XPathFunctionResolver.h index b526d01a035..106122767a3 100644 --- a/libjava/javax/xml/xpath/XPathFunctionResolver.h +++ b/libjava/javax/xml/xpath/XPathFunctionResolver.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -30,7 +30,7 @@ class javax::xml::xpath::XPathFunctionResolver : public ::java::lang::Object { public: - virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint) = 0; + virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/xpath/XPathVariableResolver.h b/libjava/javax/xml/xpath/XPathVariableResolver.h index d308cac5948..dfbd63592b1 100644 --- a/libjava/javax/xml/xpath/XPathVariableResolver.h +++ b/libjava/javax/xml/xpath/XPathVariableResolver.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -29,7 +29,7 @@ class javax::xml::xpath::XPathVariableResolver : public ::java::lang::Object { public: - virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); |