e1bea0c068
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
107 lines
4.1 KiB
C++
107 lines
4.1 KiB
C++
|
|
// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
|
|
|
|
#ifndef __java_io_ObjectInputStream__
|
|
#define __java_io_ObjectInputStream__
|
|
|
|
#pragma interface
|
|
|
|
#include <java/io/InputStream.h>
|
|
#include <gcj/array.h>
|
|
|
|
|
|
class java::io::ObjectInputStream : public ::java::io::InputStream
|
|
{
|
|
|
|
public:
|
|
ObjectInputStream(::java::io::InputStream *);
|
|
virtual ::java::lang::Object * readObject();
|
|
virtual ::java::lang::Object * readUnshared();
|
|
private:
|
|
::java::lang::Object * readObject(jboolean);
|
|
::java::lang::Object * parseContent(jbyte, jboolean);
|
|
void checkTypeConsistency(::java::lang::String *, JArray< ::java::io::ObjectStreamField * > *, JArray< ::java::io::ObjectStreamField * > *);
|
|
public: // actually protected
|
|
virtual ::java::io::ObjectStreamClass * readClassDescriptor();
|
|
public:
|
|
virtual void defaultReadObject();
|
|
virtual void registerValidation(::java::io::ObjectInputValidation *, jint);
|
|
public: // actually protected
|
|
virtual ::java::lang::Class * resolveClass(::java::io::ObjectStreamClass *);
|
|
private:
|
|
::java::lang::ClassLoader * currentLoader();
|
|
::java::io::ObjectStreamClass * lookupClass(::java::lang::Class *);
|
|
JArray< ::java::io::ObjectStreamClass * > * hierarchy(::java::lang::Class *);
|
|
public: // actually protected
|
|
virtual ::java::lang::Object * resolveObject(::java::lang::Object *);
|
|
virtual ::java::lang::Class * resolveProxyClass(JArray< ::java::lang::String * > *);
|
|
virtual jboolean enableResolveObject(jboolean);
|
|
virtual void readStreamHeader();
|
|
public:
|
|
virtual jint read();
|
|
virtual jint read(JArray< jbyte > *, jint, jint);
|
|
virtual jint available();
|
|
virtual void close();
|
|
virtual jboolean readBoolean();
|
|
virtual jbyte readByte();
|
|
virtual jint readUnsignedByte();
|
|
virtual jshort readShort();
|
|
virtual jint readUnsignedShort();
|
|
virtual jchar readChar();
|
|
virtual jint readInt();
|
|
virtual jlong readLong();
|
|
virtual jfloat readFloat();
|
|
virtual jdouble readDouble();
|
|
virtual void readFully(JArray< jbyte > *);
|
|
virtual void readFully(JArray< jbyte > *, jint, jint);
|
|
virtual jint skipBytes(jint);
|
|
virtual ::java::lang::String * readLine();
|
|
virtual ::java::lang::String * readUTF();
|
|
virtual ::java::io::ObjectInputStream$GetField * readFields();
|
|
public: // actually protected
|
|
ObjectInputStream();
|
|
virtual ::java::lang::Object * readObjectOverride();
|
|
private:
|
|
jint assignNewHandle(::java::lang::Object *, jboolean);
|
|
void rememberHandle(::java::lang::Object *, jboolean, jint);
|
|
::java::lang::Object * lookupHandle(jint);
|
|
::java::lang::Object * processResolution(::java::io::ObjectStreamClass *, ::java::lang::Object *, jint, jboolean);
|
|
void clearHandles();
|
|
void readNextBlock();
|
|
void readNextBlock(jbyte);
|
|
void readArrayElements(::java::lang::Object *, ::java::lang::Class *);
|
|
void readFields(::java::lang::Object *, ::java::io::ObjectStreamClass *);
|
|
jboolean setBlockDataMode(jboolean);
|
|
::java::lang::Object * newObject(::java::lang::Class *, ::java::lang::reflect::Constructor *);
|
|
void invokeValidators();
|
|
void callReadMethod(::java::lang::reflect::Method *, ::java::lang::Class *, ::java::lang::Object *);
|
|
void dumpElement(::java::lang::String *);
|
|
void dumpElementln(::java::lang::String *);
|
|
void dumpElementln(::java::lang::String *, ::java::lang::Object *);
|
|
static const jint BUFFER_SIZE = 1024;
|
|
::java::io::DataInputStream * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) realInputStream;
|
|
::java::io::DataInputStream * dataInputStream;
|
|
::java::io::DataInputStream * blockDataInput;
|
|
jint blockDataPosition;
|
|
jint blockDataBytes;
|
|
JArray< jbyte > * blockData;
|
|
jboolean useSubclassMethod;
|
|
jint nextOID;
|
|
jboolean resolveEnabled;
|
|
::java::util::Map * handles;
|
|
::java::lang::Object * currentObject;
|
|
::java::io::ObjectStreamClass * currentObjectStreamClass;
|
|
::java::util::TreeSet * currentObjectValidators;
|
|
jboolean readDataFromBlock;
|
|
jboolean fieldsAlreadyRead;
|
|
::java::util::Hashtable * classLookupTable;
|
|
::java::io::ObjectInputStream$GetField * prereadFields;
|
|
static jboolean dump;
|
|
jint depth;
|
|
static const jboolean DEBUG = 0;
|
|
public:
|
|
static ::java::lang::Class class$;
|
|
};
|
|
|
|
#endif // __java_io_ObjectInputStream__
|