From f06a83c0b2f7761510836194a6c9a8a72000937c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 4 Aug 2007 10:53:49 +0000 Subject: Import GNU Classpath (libgcj-import-20070727). libjava/ 2007-08-04 Matthias Klose 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 * java/util/EnumMap.java (clone): Add cast. From-SVN: r127204 --- libjava/classpath/java/rmi/activation/ActivationDesc.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libjava/classpath/java/rmi/activation/ActivationDesc.java') diff --git a/libjava/classpath/java/rmi/activation/ActivationDesc.java b/libjava/classpath/java/rmi/activation/ActivationDesc.java index b861656..ae2b78e 100644 --- a/libjava/classpath/java/rmi/activation/ActivationDesc.java +++ b/libjava/classpath/java/rmi/activation/ActivationDesc.java @@ -80,7 +80,7 @@ public final class ActivationDesc /** * The object specific intitalization data. */ - private MarshalledObject data; + private MarshalledObject data; /** * The start mode. @@ -95,7 +95,7 @@ public final class ActivationDesc * @param location the code base URL * @param data the object initialization data, contained in a marshalled form */ - public ActivationDesc(String className, String location, MarshalledObject data) + public ActivationDesc(String className, String location, MarshalledObject data) throws ActivationException { this(ActivationGroup.currentGroupID(), className, location, data, false); @@ -115,7 +115,7 @@ public final class ActivationDesc * object is normally activated on demand). */ public ActivationDesc(String className, String location, - MarshalledObject data, boolean restart) + MarshalledObject data, boolean restart) throws ActivationException { this(ActivationGroup.currentGroupID(), className, location, data, restart); @@ -131,7 +131,7 @@ public final class ActivationDesc * @param data the object initialization data, contained in a marshalled form */ public ActivationDesc(ActivationGroupID groupID, String className, - String location, MarshalledObject data) + String location, MarshalledObject data) { this(groupID, className, location, data, false); } @@ -150,7 +150,7 @@ public final class ActivationDesc * object is normally activated on demand). */ public ActivationDesc(ActivationGroupID groupID, String className, - String location, MarshalledObject data, boolean restart) + String location, MarshalledObject data, boolean restart) { this.groupid = groupID; this.classname = className; @@ -184,7 +184,7 @@ public final class ActivationDesc return location; } - public MarshalledObject getData() + public MarshalledObject getData() { return data; } -- cgit v1.1