diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2007-08-04 10:53:49 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2007-08-04 10:53:49 +0000 |
| commit | f06a83c0b2f7761510836194a6c9a8a72000937c (patch) | |
| tree | 871b70a606d87369d5aa9d6f621baedc13b49eba /libjava/gnu/xml/dom | |
| parent | 2c3de459b647a72fc35d66adeda274ba0f14347b (diff) | |
| download | gcc-f06a83c0b2f7761510836194a6c9a8a72000937c.zip gcc-f06a83c0b2f7761510836194a6c9a8a72000937c.tar.gz gcc-f06a83c0b2f7761510836194a6c9a8a72000937c.tar.bz2 | |
Import GNU Classpath (libgcj-import-20070727).
libjava/
2007-08-04 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20070727).
* Regenerate class and header files.
* Regenerate auto* files.
* include/jvm.h:
* jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type.
* jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise.
* jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA,
_Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA,
_Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA,
_Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify
jvalue parameter.
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise.
* java/lang/VMFloat.java (toString, parseFloat): New.
* gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported,
isModalExclusionTypeSupported): New (stub only).
* gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise.
* gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages,
updateFocusableWindowState, setModalBlocked, getBoundsPrivate,
setAlwaysOnTop): Likewise.
* gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature.
* scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer,
ignore javax.sound.sampled.spi.MixerProvider, ignore .in files.
* HACKING: Mention --enable-gstreamer-peer, removal of generated files.
libjava/classpath/
2007-08-04 Matthias Klose <doko@ubuntu.com>
* java/util/EnumMap.java (clone): Add cast.
From-SVN: r127204
Diffstat (limited to 'libjava/gnu/xml/dom')
| -rw-r--r-- | libjava/gnu/xml/dom/DomDocument.h | 6 | ||||
| -rw-r--r-- | libjava/gnu/xml/dom/DomNamedNodeMap.h | 2 | ||||
| -rw-r--r-- | libjava/gnu/xml/dom/DomNode.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/gnu/xml/dom/DomDocument.h b/libjava/gnu/xml/dom/DomDocument.h index e11ce62..d634485 100644 --- a/libjava/gnu/xml/dom/DomDocument.h +++ b/libjava/gnu/xml/dom/DomDocument.h @@ -68,6 +68,7 @@ public: virtual void setBuilding(jboolean); virtual void setCheckWellformedness(jboolean); virtual void setCheckingCharacters(jboolean); + virtual void setDefaultAttributes(jboolean); virtual ::java::lang::String * getNodeName(); virtual ::org::w3c::dom::Element * getDocumentElement(); virtual ::org::w3c::dom::DocumentType * getDoctype(); @@ -89,7 +90,7 @@ public: virtual ::org::w3c::dom::Element * createElement(::java::lang::String *); virtual ::org::w3c::dom::Element * createElementNS(::java::lang::String *, ::java::lang::String *); private: - void defaultAttributes(::org::w3c::dom::Element *, ::java::lang::String *); + void setDefaultAttributes(::org::w3c::dom::Element *, ::java::lang::String *); public: virtual ::org::w3c::dom::DocumentFragment * createDocumentFragment(); virtual ::org::w3c::dom::Text * createTextNode(::java::lang::String *); @@ -140,6 +141,9 @@ private: jboolean checkingCharacters; public: // actually package-private jboolean checkingWellformedness; +private: + jboolean defaultAttributes; +public: // actually package-private jboolean building; ::gnu::xml::dom::DomDocumentConfiguration * config; ::java::lang::String * inputEncoding; diff --git a/libjava/gnu/xml/dom/DomNamedNodeMap.h b/libjava/gnu/xml/dom/DomNamedNodeMap.h index c26f2af..3d5f41b 100644 --- a/libjava/gnu/xml/dom/DomNamedNodeMap.h +++ b/libjava/gnu/xml/dom/DomNamedNodeMap.h @@ -45,7 +45,7 @@ public: virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *); virtual ::org::w3c::dom::Node * setNamedItemNS(::org::w3c::dom::Node *); public: // actually package-private - virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *, jboolean); + virtual ::org::w3c::dom::Node * setNamedItem(::org::w3c::dom::Node *, jboolean, jboolean); virtual void reparent(::gnu::xml::dom::DomNode *, ::java::lang::String *, jint); public: virtual ::org::w3c::dom::Node * removeNamedItem(::java::lang::String *); diff --git a/libjava/gnu/xml/dom/DomNode.h b/libjava/gnu/xml/dom/DomNode.h index 7632847..dca589a 100644 --- a/libjava/gnu/xml/dom/DomNode.h +++ b/libjava/gnu/xml/dom/DomNode.h @@ -94,6 +94,8 @@ public: virtual ::java::lang::String * getNamespaceURI(); virtual ::java::lang::String * getLocalName(); virtual ::org::w3c::dom::Node * cloneNode(jboolean); +private: + ::gnu::xml::dom::DomNode * cloneNodeDeepInternal(jboolean, ::gnu::xml::dom::DomDocument *); public: // actually package-private virtual void notifyUserDataHandlers(jshort, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *); public: |