Import GNU Classpath (libgcj-import-20070727).
libjava/ 2007-08-04 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20070727). * Regenerate class and header files. * Regenerate auto* files. * include/jvm.h: * jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type. * jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise. * jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA, _Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA, _Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA, _Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify jvalue parameter. * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise. * java/lang/VMFloat.java (toString, parseFloat): New. * gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported, isModalExclusionTypeSupported): New (stub only). * gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise. * gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages, updateFocusableWindowState, setModalBlocked, getBoundsPrivate, setAlwaysOnTop): Likewise. * gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature. * scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer, ignore javax.sound.sampled.spi.MixerProvider, ignore .in files. * HACKING: Mention --enable-gstreamer-peer, removal of generated files. libjava/classpath/ 2007-08-04 Matthias Klose <doko@ubuntu.com> * java/util/EnumMap.java (clone): Add cast. From-SVN: r127204
This commit is contained in:
@@ -58,7 +58,7 @@ import java.io.Serializable;
|
||||
*
|
||||
* @author unknown
|
||||
*/
|
||||
public final class MarshalledObject
|
||||
public final class MarshalledObject<T>
|
||||
implements Serializable
|
||||
{
|
||||
// The following fields are from Java API Documentation "Serialized form"
|
||||
@@ -74,7 +74,7 @@ public final class MarshalledObject
|
||||
* @param obj the object to marshal
|
||||
* @throws IOException if an I/O error during serialization occurs.
|
||||
*/
|
||||
public MarshalledObject(Object obj) throws IOException
|
||||
public MarshalledObject(T obj) throws IOException
|
||||
{
|
||||
ByteArrayOutputStream objStream = new ByteArrayOutputStream();
|
||||
RMIMarshalledObjectOutputStream stream =
|
||||
@@ -136,14 +136,14 @@ public final class MarshalledObject
|
||||
* @throws ClassNotFoundException if the class of the deserialized object
|
||||
* cannot be found.
|
||||
*/
|
||||
public Object get() throws IOException, ClassNotFoundException
|
||||
public T get() throws IOException, ClassNotFoundException
|
||||
{
|
||||
if (objBytes == null)
|
||||
return null;
|
||||
|
||||
RMIMarshalledObjectInputStream stream =
|
||||
new RMIMarshalledObjectInputStream(objBytes, locBytes);
|
||||
return stream.readObject();
|
||||
return (T) stream.readObject();
|
||||
}
|
||||
|
||||
public int hashCode()
|
||||
|
||||
Reference in New Issue
Block a user