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/java/net/BASE64.h | 41 ---------------------- libjava/gnu/java/net/GetLocalHostAction.h | 8 +++++ .../java/net/protocol/http/ChunkedInputStream.h | 3 -- libjava/gnu/java/net/protocol/http/Headers.h | 2 -- .../java/net/protocol/http/SimpleCookieManager.h | 2 +- 5 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 libjava/gnu/java/net/BASE64.h (limited to 'libjava/gnu/java/net') diff --git a/libjava/gnu/java/net/BASE64.h b/libjava/gnu/java/net/BASE64.h deleted file mode 100644 index 77616ba5136..00000000000 --- a/libjava/gnu/java/net/BASE64.h +++ /dev/null @@ -1,41 +0,0 @@ - -// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- - -#ifndef __gnu_java_net_BASE64__ -#define __gnu_java_net_BASE64__ - -#pragma interface - -#include -#include - -extern "Java" -{ - namespace gnu - { - namespace java - { - namespace net - { - class BASE64; - } - } - } -} - -class gnu::java::net::BASE64 : public ::java::lang::Object -{ - - BASE64(); -public: - static JArray< jbyte > * encode(JArray< jbyte > *); - static JArray< jbyte > * decode(JArray< jbyte > *); - static void main(JArray< ::java::lang::String * > *); -private: - static JArray< jbyte > * src; - static JArray< jbyte > * dst; -public: - static ::java::lang::Class class$; -}; - -#endif // __gnu_java_net_BASE64__ diff --git a/libjava/gnu/java/net/GetLocalHostAction.h b/libjava/gnu/java/net/GetLocalHostAction.h index 7c82e46fa71..f0d088064e8 100644 --- a/libjava/gnu/java/net/GetLocalHostAction.h +++ b/libjava/gnu/java/net/GetLocalHostAction.h @@ -19,6 +19,13 @@ extern "Java" } } } + namespace java + { + namespace net + { + class InetAddress; + } + } } class gnu::java::net::GetLocalHostAction : public ::java::lang::Object @@ -26,6 +33,7 @@ class gnu::java::net::GetLocalHostAction : public ::java::lang::Object public: GetLocalHostAction(); + virtual ::java::net::InetAddress * GetLocalHostAction$run(); virtual ::java::lang::Object * run(); static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h index 16a27056bcb..4a362e96b72 100644 --- a/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h +++ b/libjava/gnu/java/net/protocol/http/ChunkedInputStream.h @@ -39,9 +39,6 @@ public: virtual jint read(JArray< jbyte > *, jint, jint); virtual jint available(); virtual void close(); -private: - static const jbyte CR = 13; - static const jbyte LF = 10; public: // actually package-private ::gnu::java::net::protocol::http::Headers * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) headers; private: diff --git a/libjava/gnu/java/net/protocol/http/Headers.h b/libjava/gnu/java/net/protocol/http/Headers.h index d7c485c2511..cad6e68a7f5 100644 --- a/libjava/gnu/java/net/protocol/http/Headers.h +++ b/libjava/gnu/java/net/protocol/http/Headers.h @@ -39,9 +39,7 @@ class gnu::java::net::protocol::http::Headers : public ::java::lang::Object public: Headers(); -public: // actually package-private virtual ::java::util::Iterator * iterator(); -public: virtual ::java::lang::String * getValue(::java::lang::String *); virtual jint getIntValue(::java::lang::String *); virtual jlong getLongValue(::java::lang::String *); diff --git a/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h b/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h index e8259a8a2cb..fc0b0bf3268 100644 --- a/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h +++ b/libjava/gnu/java/net/protocol/http/SimpleCookieManager.h @@ -38,7 +38,7 @@ public: virtual void setCookie(::gnu::java::net::protocol::http::Cookie *); virtual JArray< ::gnu::java::net::protocol::http::Cookie * > * getCookies(::java::lang::String *, jboolean, ::java::lang::String *); private: - void addCookies(::java::util::List *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::util::Date *); + void addCookies(::java::util::ArrayList *, ::java::lang::String *, jboolean, ::java::lang::String *, ::java::util::Date *); public: // actually protected ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cookies; public: -- cgit v1.2.3