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:
@@ -199,7 +199,7 @@ public final class ActivationGroupDesc
|
||||
/**
|
||||
* The group initialization data.
|
||||
*/
|
||||
final MarshalledObject data;
|
||||
final MarshalledObject<?> data;
|
||||
|
||||
/**
|
||||
* The path to the group jre and the parameters of this jre, may be
|
||||
@@ -252,7 +252,7 @@ public final class ActivationGroupDesc
|
||||
* options.
|
||||
*/
|
||||
public ActivationGroupDesc(String aClassName, String aLocation,
|
||||
MarshalledObject aData, Properties aProperties,
|
||||
MarshalledObject<?> aData, Properties aProperties,
|
||||
ActivationGroupDesc.CommandEnvironment environment)
|
||||
{
|
||||
className = aClassName;
|
||||
@@ -288,7 +288,7 @@ public final class ActivationGroupDesc
|
||||
*
|
||||
* @return the group intialization data in the marshalled form.
|
||||
*/
|
||||
public MarshalledObject getData()
|
||||
public MarshalledObject<?> getData()
|
||||
{
|
||||
return data;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user