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
This commit is contained in:
Matthias Klose
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
|
@ -170,6 +170,7 @@ public class ObjectOutputStream extends OutputStream
|
|||
* If an exception is thrown from this method, the stream is left in
|
||||
* an undefined state.
|
||||
*
|
||||
* @param obj the object to serialize.
|
||||
* @exception NotSerializableException An attempt was made to
|
||||
* serialize an <code>Object</code> that is not serializable.
|
||||
*
|
||||
|
|
@ -178,8 +179,70 @@ public class ObjectOutputStream extends OutputStream
|
|||
*
|
||||
* @exception IOException Exception from underlying
|
||||
* <code>OutputStream</code>.
|
||||
* @see #writeUnshared(Object)
|
||||
*/
|
||||
public final void writeObject(Object obj) throws IOException
|
||||
{
|
||||
writeObject(obj, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes an object to the stream in the same manner as
|
||||
* {@link #writeObject(Object)}, but without the use of
|
||||
* references. As a result, the object is always written
|
||||
* to the stream in full. Likewise, if an object is written
|
||||
* by this method and is then later written again by
|
||||
* {@link #writeObject(Object)}, both calls will write out
|
||||
* the object in full, as the later call to
|
||||
* {@link #writeObject(Object)} will know nothing of the
|
||||
* earlier use of {@link #writeUnshared(Object)}.
|
||||
*
|
||||
* @param obj the object to serialize.
|
||||
* @throws NotSerializableException if the object being
|
||||
* serialized does not implement
|
||||
* {@link Serializable}.
|
||||
* @throws InvalidClassException if a problem occurs with
|
||||
* the class of the object being
|
||||
* serialized.
|
||||
* @throws IOException if an I/O error occurs on the underlying
|
||||
* <code>OutputStream</code>.
|
||||
* @since 1.4
|
||||
* @see #writeObject(Object)
|
||||
*/
|
||||
public void writeUnshared(Object obj)
|
||||
throws IOException
|
||||
{
|
||||
writeObject(obj, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes a representation of <code>obj</code> to the underlying
|
||||
* output stream by writing out information about its class, then
|
||||
* writing out each of the objects non-transient, non-static
|
||||
* fields. If any of these fields are other objects,
|
||||
* they are written out in the same manner.
|
||||
*
|
||||
* This method can be overriden by a class by implementing
|
||||
* <code>private void writeObject (ObjectOutputStream)</code>.
|
||||
*
|
||||
* If an exception is thrown from this method, the stream is left in
|
||||
* an undefined state.
|
||||
*
|
||||
* @param obj the object to serialize.
|
||||
* @param shared true if the serialized object should be
|
||||
* shared with later calls.
|
||||
* @exception NotSerializableException An attempt was made to
|
||||
* serialize an <code>Object</code> that is not serializable.
|
||||
*
|
||||
* @exception InvalidClassException Somebody tried to serialize
|
||||
* an object which is wrongly formatted.
|
||||
*
|
||||
* @exception IOException Exception from underlying
|
||||
* <code>OutputStream</code>.
|
||||
* @see #writeUnshared(Object)
|
||||
*/
|
||||
private final void writeObject(Object obj, boolean shared)
|
||||
throws IOException
|
||||
{
|
||||
if (useSubclassMethod)
|
||||
{
|
||||
|
|
@ -212,7 +275,7 @@ public class ObjectOutputStream extends OutputStream
|
|||
}
|
||||
|
||||
int handle = findHandle(obj);
|
||||
if (handle >= 0)
|
||||
if (handle >= 0 && shared)
|
||||
{
|
||||
realOutput.writeByte(TC_REFERENCE);
|
||||
realOutput.writeInt(handle);
|
||||
|
|
@ -243,7 +306,8 @@ public class ObjectOutputStream extends OutputStream
|
|||
|
||||
writeObject(osc.getSuper());
|
||||
}
|
||||
assignNewHandle(obj);
|
||||
if (shared)
|
||||
assignNewHandle(obj);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -263,7 +327,8 @@ public class ObjectOutputStream extends OutputStream
|
|||
/* TC_ENUM classDesc newHandle enumConstantName */
|
||||
realOutput.writeByte(TC_ENUM);
|
||||
writeObject(osc);
|
||||
assignNewHandle(obj);
|
||||
if (shared)
|
||||
assignNewHandle(obj);
|
||||
writeObject(((Enum) obj).name());
|
||||
break;
|
||||
}
|
||||
|
|
@ -299,7 +364,8 @@ public class ObjectOutputStream extends OutputStream
|
|||
if (obj instanceof String)
|
||||
{
|
||||
realOutput.writeByte(TC_STRING);
|
||||
assignNewHandle(obj);
|
||||
if (shared)
|
||||
assignNewHandle(obj);
|
||||
realOutput.writeUTF((String)obj);
|
||||
break;
|
||||
}
|
||||
|
|
@ -308,7 +374,8 @@ public class ObjectOutputStream extends OutputStream
|
|||
{
|
||||
realOutput.writeByte(TC_ARRAY);
|
||||
writeObject(osc);
|
||||
assignNewHandle(obj);
|
||||
if (shared)
|
||||
assignNewHandle(obj);
|
||||
writeArraySizeAndElements(obj, clazz.getComponentType());
|
||||
break;
|
||||
}
|
||||
|
|
@ -316,11 +383,12 @@ public class ObjectOutputStream extends OutputStream
|
|||
realOutput.writeByte(TC_OBJECT);
|
||||
writeObject(osc);
|
||||
|
||||
if (replaceDone)
|
||||
assignNewHandle(replacedObject);
|
||||
else
|
||||
assignNewHandle(obj);
|
||||
|
||||
if (shared)
|
||||
if (replaceDone)
|
||||
assignNewHandle(replacedObject);
|
||||
else
|
||||
assignNewHandle(obj);
|
||||
|
||||
if (obj instanceof Externalizable)
|
||||
{
|
||||
if (protocolVersion == PROTOCOL_VERSION_2)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue