From e1bea0c0687c5f4551b3a6058ec37ce3705fa6cc Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@gcc.gnu.org>
Date: Sun, 3 Jun 2007 23:18:43 +0000
Subject: libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
---
libjava/javax/management/openmbean/ArrayType.h | 15 +++++++-
.../openmbean/CompositeDataInvocationHandler.h | 40 ++++++++++++++++++++++
libjava/javax/management/openmbean/OpenType.h | 1 +
3 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
(limited to 'libjava/javax/management/openmbean')
diff --git a/libjava/javax/management/openmbean/ArrayType.h b/libjava/javax/management/openmbean/ArrayType.h
index ba8dece..e559cf2 100644
--- a/libjava/javax/management/openmbean/ArrayType.h
+++ b/libjava/javax/management/openmbean/ArrayType.h
@@ -17,6 +17,7 @@ extern "Java"
{
class ArrayType;
class OpenType;
+ class SimpleType;
}
}
}
@@ -25,21 +26,33 @@ extern "Java"
class javax::management::openmbean::ArrayType : public ::javax::management::openmbean::OpenType
{
- static ::java::lang::String * getArrayClassName(::java::lang::String *, jint);
+ static ::java::lang::String * getArrayClassName(::javax::management::openmbean::OpenType *, jint, jboolean);
+ static jint getDimensions(::javax::management::openmbean::OpenType *, jint);
+ static ::javax::management::openmbean::SimpleType * getPrimitiveType(::java::lang::Class *);
+ static ::java::lang::Class * getPrimitiveTypeClass(::javax::management::openmbean::SimpleType *);
+ static ::javax::management::openmbean::OpenType * getElementType(::javax::management::openmbean::OpenType *);
+ static ::java::lang::String * getElementTypeName(::javax::management::openmbean::OpenType *);
public:
ArrayType(jint, ::javax::management::openmbean::OpenType *);
+ ArrayType(::javax::management::openmbean::SimpleType *, jboolean);
virtual jboolean equals(::java::lang::Object *);
+ static ::javax::management::openmbean::ArrayType * getArrayType(::javax::management::openmbean::OpenType *);
+ static ::javax::management::openmbean::ArrayType * getPrimitiveArrayType(::java::lang::Class *);
virtual jint getDimension();
virtual ::javax::management::openmbean::OpenType * getElementOpenType();
virtual jint hashCode();
+ virtual jboolean isPrimitiveArray();
virtual jboolean isValue(::java::lang::Object *);
virtual ::java::lang::String * toString();
private:
static const jlong serialVersionUID = 720504429830309770LL;
jint __attribute__((aligned(__alignof__( ::javax::management::openmbean::OpenType)))) dimension;
::javax::management::openmbean::OpenType * elementType;
+ jboolean primitiveArray;
::java::lang::Integer * hashCode__;
::java::lang::String * string;
+ static ::java::util::Map * cache;
+ static ::java::util::Map * primCache;
public:
static ::java::lang::Class class$;
};
diff --git a/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h b/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
new file mode 100644
index 0000000..e10d364
--- /dev/null
+++ b/libjava/javax/management/openmbean/CompositeDataInvocationHandler.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_management_openmbean_CompositeDataInvocationHandler__
+#define __javax_management_openmbean_CompositeDataInvocationHandler__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+ namespace javax
+ {
+ namespace management
+ {
+ namespace openmbean
+ {
+ class CompositeData;
+ class CompositeDataInvocationHandler;
+ }
+ }
+ }
+}
+
+class javax::management::openmbean::CompositeDataInvocationHandler : public ::java::lang::Object
+{
+
+public:
+ CompositeDataInvocationHandler(::javax::management::openmbean::CompositeData *);
+ virtual ::javax::management::openmbean::CompositeData * getCompositeData();
+ virtual ::java::lang::Object * invoke(::java::lang::Object *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *);
+private:
+ ::javax::management::openmbean::CompositeData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __javax_management_openmbean_CompositeDataInvocationHandler__
diff --git a/libjava/javax/management/openmbean/OpenType.h b/libjava/javax/management/openmbean/OpenType.h
index 4150cf1..b442b64 100644
--- a/libjava/javax/management/openmbean/OpenType.h
+++ b/libjava/javax/management/openmbean/OpenType.h
@@ -44,6 +44,7 @@ private:
::java::lang::String * description;
public:
static JArray< ::java::lang::String * > * ALLOWED_CLASSNAMES;
+ static ::java::util::List * ALLOWED_CLASSNAMES_LIST;
static ::java::lang::Class class$;
};
--
cgit v1.1