From 5bf762459121cc397663d22498d62d71fa179ef6 Mon Sep 17 00:00:00 2001 From: doko Date: Sun, 3 Jun 2007 23:18:43 +0000 Subject: libjava/classpath/ChangeLog.gcj: 2007-05-31 Matthias Klose * 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 * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose 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 * 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 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/classpath/Configuration.java | 5 ++- libjava/gnu/classpath/Pair.h | 37 ++++++++++++++++ .../gnu/classpath/ServiceFactory$ServiceIterator.h | 3 +- libjava/gnu/classpath/ServiceFactory.h | 1 + libjava/gnu/classpath/jdwp/util/Value.h | 50 ---------------------- 5 files changed, 43 insertions(+), 53 deletions(-) create mode 100644 libjava/gnu/classpath/Pair.h delete mode 100644 libjava/gnu/classpath/jdwp/util/Value.h (limited to 'libjava/gnu/classpath') diff --git a/libjava/gnu/classpath/Configuration.java b/libjava/gnu/classpath/Configuration.java index 6899b77c44e..73e3c2f0408 100644 --- a/libjava/gnu/classpath/Configuration.java +++ b/libjava/gnu/classpath/Configuration.java @@ -1,5 +1,6 @@ /* Configuration.java -- - Copyright (C) 1998, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1998, 2001, 2003, 2005, 2006, 2007 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +66,7 @@ public final class Configuration * It is set according to the value of 'version' in the configure[.in] file * and used to set the System property gnu.classpath.version. */ - public static final String CLASSPATH_VERSION = "0.93"; + public static final String CLASSPATH_VERSION = "0.95"; /** * The value of DEBUG is substituted according to whether the diff --git a/libjava/gnu/classpath/Pair.h b/libjava/gnu/classpath/Pair.h new file mode 100644 index 00000000000..98b3e23e25b --- /dev/null +++ b/libjava/gnu/classpath/Pair.h @@ -0,0 +1,37 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __gnu_classpath_Pair__ +#define __gnu_classpath_Pair__ + +#pragma interface + +#include +extern "Java" +{ + namespace gnu + { + namespace classpath + { + class Pair; + } + } +} + +class gnu::classpath::Pair : public ::java::lang::Object +{ + +public: + Pair(::java::lang::Object *, ::java::lang::Object *); + virtual ::java::lang::Object * getLeft(); + virtual ::java::lang::Object * getRight(); + virtual jboolean equals(::java::lang::Object *); + virtual jint hashCode(); +private: + ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) left; + ::java::lang::Object * right; +public: + static ::java::lang::Class class$; +}; + +#endif // __gnu_classpath_Pair__ diff --git a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h index a64ca4ff668..2d532add995 100644 --- a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h +++ b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h @@ -33,7 +33,7 @@ class gnu::classpath::ServiceFactory$ServiceIterator : public ::java::lang::Obje { public: // actually package-private - ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, ::java::security::AccessControlContext *); + ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, jboolean, ::java::security::AccessControlContext *); public: ::java::lang::Object * next(); jboolean hasNext(); @@ -48,6 +48,7 @@ private: ::java::io::BufferedReader * reader; ::java::net::URL * currentURL; ::java::lang::Object * nextProvider; + jboolean error; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/classpath/ServiceFactory.h b/libjava/gnu/classpath/ServiceFactory.h index fddad85b14f..d335427fc3f 100644 --- a/libjava/gnu/classpath/ServiceFactory.h +++ b/libjava/gnu/classpath/ServiceFactory.h @@ -24,6 +24,7 @@ class gnu::classpath::ServiceFactory : public ::java::lang::Object ServiceFactory(); public: static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *); + static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *, jboolean); static ::java::util::Iterator * lookupProviders(::java::lang::Class *); public: // actually package-private static void log(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Throwable *); diff --git a/libjava/gnu/classpath/jdwp/util/Value.h b/libjava/gnu/classpath/jdwp/util/Value.h deleted file mode 100644 index 01dda3fa878..00000000000 --- a/libjava/gnu/classpath/jdwp/util/Value.h +++ /dev/null @@ -1,50 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_classpath_jdwp_util_Value__ -#define __gnu_classpath_jdwp_util_Value__ - -#pragma interface - -#include -extern "Java" -{ - namespace gnu - { - namespace classpath - { - namespace jdwp - { - namespace util - { - class Value; - } - } - } - } - namespace java - { - namespace nio - { - class ByteBuffer; - } - } -} - -class gnu::classpath::jdwp::util::Value : public ::java::lang::Object -{ - -public: - Value(); - static void writeUntaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *); - static void writeTaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *); -private: - static void writeValue(::java::io::DataOutputStream *, ::java::lang::Object *, jboolean); -public: - static ::java::lang::Object * getObj(::java::nio::ByteBuffer *); - static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, ::java::lang::Class *); - static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, jbyte); - static ::java::lang::Class class$; -}; - -#endif // __gnu_classpath_jdwp_util_Value__ -- cgit v1.2.3