Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5307] trunk/core/src
|
From: <cr...@us...> - 2009-04-18 15:07:15
|
Revision: 5307
http://jnode.svn.sourceforge.net/jnode/?rev=5307&view=rev
Author: crawley
Date: 2009-04-18 15:07:04 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
Fixed warnings: raw type use, missing serialVersionNo's. Minor style fixes.
Modified Paths:
--------------
trunk/core/src/classpath/ext/javax/isolate/ClosedLinkException.java
trunk/core/src/classpath/ext/javax/isolate/IsolatePermission.java
trunk/core/src/classpath/ext/javax/isolate/IsolateStartupException.java
trunk/core/src/core/org/jnode/assembler/Label.java
trunk/core/src/core/org/jnode/assembler/NativeStream.java
trunk/core/src/core/org/jnode/assembler/UnresolvedObjectRefException.java
trunk/core/src/core/org/jnode/assembler/x86/X86Assembler.java
trunk/core/src/core/org/jnode/assembler/x86/X86BinaryAssembler.java
trunk/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java
trunk/core/src/core/org/jnode/boot/Main.java
trunk/core/src/core/org/jnode/debug/UDPOutputStream.java
trunk/core/src/core/org/jnode/imageio/jpeg/JPEGException.java
trunk/core/src/core/org/jnode/imageio/jpeg/JPEGImageReader.java
trunk/core/src/openjdk/vm/java/io/NativeObjectInputStream.java
trunk/core/src/openjdk/vm/java/io/NativeObjectStreamClass.java
trunk/core/src/openjdk/vm/java/lang/NativeClass.java
trunk/core/src/openjdk/vm/java/lang/NativeStrictMath.java
trunk/core/src/openjdk/vm/java/lang/reflect/NativeArray.java
trunk/core/src/openjdk/vm/java/lang/reflect/NativeProxy.java
trunk/core/src/openjdk/vm/java/util/NativeResourceBundle.java
trunk/core/src/openjdk/vm/java/util/jar/NativeJarFile.java
trunk/core/src/openjdk/vm/sun/awt/image/NativeBufImgSurfaceData.java
trunk/core/src/openjdk/vm/sun/awt/image/NativeJPEGImageDecoder.java
trunk/core/src/openjdk/vm/sun/font/NativeFontManager.java
trunk/core/src/openjdk/vm/sun/font/NativeFreetypeFontScaler.java
trunk/core/src/openjdk/vm/sun/java2d/loops/NativeGraphicsPrimitiveMgr.java
trunk/core/src/openjdk/vm/sun/java2d/pipe/NativeSpanClipRenderer.java
trunk/core/src/openjdk/vm/sun/misc/NativeUnsafe.java
trunk/core/src/openjdk/vm/sun/reflect/NativeConstantPool.java
trunk/core/src/openjdk/vm/sun/reflect/NativeNativeConstructorAccessorImpl.java
trunk/core/src/openjdk/vm/sun/reflect/NativeNativeMethodAccessorImpl.java
trunk/core/src/openjdk/vm/sun/reflect/NativeReflection.java
Modified: trunk/core/src/classpath/ext/javax/isolate/ClosedLinkException.java
===================================================================
--- trunk/core/src/classpath/ext/javax/isolate/ClosedLinkException.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/classpath/ext/javax/isolate/ClosedLinkException.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -27,6 +27,8 @@
*/
public class ClosedLinkException extends IOException {
+ private static final long serialVersionUID = 1L;
+
/**
* Initialize this instance.
*/
Modified: trunk/core/src/classpath/ext/javax/isolate/IsolatePermission.java
===================================================================
--- trunk/core/src/classpath/ext/javax/isolate/IsolatePermission.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/classpath/ext/javax/isolate/IsolatePermission.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -27,6 +27,8 @@
*/
public class IsolatePermission extends BasicPermission {
+ private static final long serialVersionUID = 1L;
+
/**
* @param name
* @param actions
Modified: trunk/core/src/classpath/ext/javax/isolate/IsolateStartupException.java
===================================================================
--- trunk/core/src/classpath/ext/javax/isolate/IsolateStartupException.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/classpath/ext/javax/isolate/IsolateStartupException.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -28,6 +28,8 @@
*/
public class IsolateStartupException extends Exception {
+ private static final long serialVersionUID = 1L;
+
private final String remoteName;
private final String remoteMessage;
Modified: trunk/core/src/core/org/jnode/assembler/Label.java
===================================================================
--- trunk/core/src/core/org/jnode/assembler/Label.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/assembler/Label.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -27,7 +27,7 @@
*
* @author Ewout Prangsma (ep...@us...)
*/
-public class Label extends VmAddress implements Comparable {
+public class Label extends VmAddress implements Comparable<Object> {
private final String label;
Modified: trunk/core/src/core/org/jnode/assembler/NativeStream.java
===================================================================
--- trunk/core/src/core/org/jnode/assembler/NativeStream.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/assembler/NativeStream.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -77,7 +77,7 @@
* @return The object info for the started object
* @see ObjectInfo
*/
- public abstract ObjectInfo startObject(VmType cls);
+ public abstract ObjectInfo startObject(VmType<?> cls);
/**
* Gets an objectref for a given object.
@@ -99,7 +99,7 @@
*
* @return Collection
*/
- public abstract Collection getUnresolvedObjectRefs();
+ public abstract Collection<?> getUnresolvedObjectRefs();
/**
* Are there unresolved references?
Modified: trunk/core/src/core/org/jnode/assembler/UnresolvedObjectRefException.java
===================================================================
--- trunk/core/src/core/org/jnode/assembler/UnresolvedObjectRefException.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/assembler/UnresolvedObjectRefException.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -25,6 +25,8 @@
*/
public class UnresolvedObjectRefException extends Exception {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/core/src/core/org/jnode/assembler/x86/X86Assembler.java
===================================================================
--- trunk/core/src/core/org/jnode/assembler/x86/X86Assembler.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/assembler/x86/X86Assembler.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -156,7 +156,7 @@
*
* @return Collection
*/
- public abstract Collection getUnresolvedObjectRefs();
+ public abstract Collection<?> getUnresolvedObjectRefs();
/**
* Gets the size of a word in bytes.
@@ -275,7 +275,7 @@
* @param cls
* @return The info for the started object
*/
- public abstract ObjectInfo startObject(VmType cls);
+ public abstract ObjectInfo startObject(VmType<?> cls);
/**
* Remove count bytes from the end of the generated stream.
Modified: trunk/core/src/core/org/jnode/assembler/x86/X86BinaryAssembler.java
===================================================================
--- trunk/core/src/core/org/jnode/assembler/x86/X86BinaryAssembler.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/assembler/x86/X86BinaryAssembler.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -718,7 +718,7 @@
* @return The info for the started object
* @see ObjectInfo
*/
- public final ObjectInfo startObject(VmType cls) {
+ public final ObjectInfo startObject(VmType<?> cls) {
if (inObject) {
throw new RuntimeException(
"Cannot start an object within an object");
Modified: trunk/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java
===================================================================
--- trunk/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/assembler/x86/X86TextAssembler.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -246,7 +246,7 @@
return null;
}
- public Collection getUnresolvedObjectRefs() {
+ public Collection<?> getUnresolvedObjectRefs() {
return null;
}
@@ -315,7 +315,7 @@
public void setResolver(ObjectResolver resolver) {
}
- public ObjectInfo startObject(VmType cls) {
+ public ObjectInfo startObject(VmType<?> cls) {
println(";\n; -- Start of object --\n;");
return new ObjectInfoImpl();
}
Modified: trunk/core/src/core/org/jnode/boot/Main.java
===================================================================
--- trunk/core/src/core/org/jnode/boot/Main.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/boot/Main.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -75,7 +75,7 @@
final ClassLoader loader = pluginRegistry.getPluginsClassLoader();
final String mainClassName = proc.getMainClassName();
- final Class mainClass;
+ final Class<?> mainClass;
if (mainClassName != null) {
mainClass = loader.loadClass(mainClassName);
} else {
@@ -87,7 +87,8 @@
if (mainClass != null) {
try {
- final Method mainMethod = mainClass.getMethod("main", new Class[]{String[].class});
+ final Method mainMethod =
+ mainClass.getMethod("main", new Class[]{String[].class});
mainMethod.invoke(null, new Object[]{proc.getMainClassArguments()});
} catch (NoSuchMethodException x) {
final Object insatnce = mainClass.newInstance();
Modified: trunk/core/src/core/org/jnode/debug/UDPOutputStream.java
===================================================================
--- trunk/core/src/core/org/jnode/debug/UDPOutputStream.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/debug/UDPOutputStream.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -75,7 +75,7 @@
if (!inWrite) {
inWrite = true;
try {
- AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws IOException {
final DatagramPacket p = new DatagramPacket(b, off, len);
p.setSocketAddress(address);
Modified: trunk/core/src/core/org/jnode/imageio/jpeg/JPEGException.java
===================================================================
--- trunk/core/src/core/org/jnode/imageio/jpeg/JPEGException.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/imageio/jpeg/JPEGException.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -23,6 +23,9 @@
import javax.imageio.IIOException;
public class JPEGException extends IIOException {
+
+ private static final long serialVersionUID = 1L;
+
public JPEGException(String message) {
super(message);
}
Modified: trunk/core/src/core/org/jnode/imageio/jpeg/JPEGImageReader.java
===================================================================
--- trunk/core/src/core/org/jnode/imageio/jpeg/JPEGImageReader.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/core/org/jnode/imageio/jpeg/JPEGImageReader.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -27,6 +27,7 @@
import javax.imageio.IIOException;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
+import javax.imageio.ImageTypeSpecifier;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.stream.ImageInputStream;
@@ -51,7 +52,7 @@
return null;
}
- public Iterator getImageTypes(int imageIndex) throws IOException {
+ public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
return null;
}
Modified: trunk/core/src/openjdk/vm/java/io/NativeObjectInputStream.java
===================================================================
--- trunk/core/src/openjdk/vm/java/io/NativeObjectInputStream.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/io/NativeObjectInputStream.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -31,10 +31,10 @@
* @see java.io.ObjectInputStream#bytesToFloats(byte[], int, float[], int, int)
*/
private static void bytesToFloats(byte[] src, int srcpos, float[] dst, int dstpos, int nfloats) {
- if(src == null) throw new NullPointerException();
- if(dst == null) throw new NullPointerException();
+ if (src == null) throw new NullPointerException();
+ if (dst == null) throw new NullPointerException();
int dstend = dstpos + nfloats;
- while(dstpos < dstend){
+ while (dstpos < dstend) {
int ival =
((src[srcpos ++ ] & 0xff) << 24) +
((src[srcpos ++ ] & 0xff) << 16) +
@@ -47,10 +47,10 @@
* @see java.io.ObjectInputStream#bytesToDoubles(byte[], int, double[], int, int)
*/
private static void bytesToDoubles(byte[] src, int srcpos, double[] dst, int dstpos, int ndoubles) {
- if(src == null) throw new NullPointerException();
- if(dst == null) throw new NullPointerException();
+ if (src == null) throw new NullPointerException();
+ if (dst == null) throw new NullPointerException();
int dstend = dstpos + ndoubles;
- while(dstpos < dstend){
+ while (dstpos < dstend) {
long lval =
((src[srcpos ++ ] & 0xffL) << 56) +
((src[srcpos ++ ] & 0xffL) << 48) +
@@ -67,11 +67,11 @@
* @see java.io.ObjectInputStream#latestUserDefinedLoader()
*/
private static ClassLoader latestUserDefinedLoader() {
- Class[] ctx = VmSystem.getClassContext();
+ Class<?>[] ctx = VmSystem.getClassContext();
for(int i = 0; i < ctx.length; i++){
- Class c = ctx[i];
+ Class<?> c = ctx[i];
if(!sun.reflect.MethodAccessor.class.isAssignableFrom(c) &&
- !sun.reflect.ConstructorAccessor.class.isAssignableFrom(c)){
+ !sun.reflect.ConstructorAccessor.class.isAssignableFrom(c)) {
return c.getClassLoader();
}
}
Modified: trunk/core/src/openjdk/vm/java/io/NativeObjectStreamClass.java
===================================================================
--- trunk/core/src/openjdk/vm/java/io/NativeObjectStreamClass.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/io/NativeObjectStreamClass.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -34,11 +34,12 @@
private static void initNative() {
//empty
}
+
/**
* @see java.io.ObjectStreamClass#hasStaticInitializer(java.lang.Class)
*/
- private static boolean hasStaticInitializer(Class clazz) {
- VmType vmt = VmType.fromClass(clazz);
+ private static boolean hasStaticInitializer(Class<?> clazz) {
+ VmType<?> vmt = VmType.fromClass(clazz);
VmMethod met = vmt.getDeclaredMethod("<clinit>", "()V");
return met != null && met.isStatic();
}
Modified: trunk/core/src/openjdk/vm/java/lang/NativeClass.java
===================================================================
--- trunk/core/src/openjdk/vm/java/lang/NativeClass.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/lang/NativeClass.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -48,64 +48,74 @@
private static void registerNatives() {
}
+
/**
* @see java.lang.Class#forName0(java.lang.String, boolean, java.lang.ClassLoader)
*/
- private static Class forName0(String arg1, boolean arg2, ClassLoader arg3) throws ClassNotFoundException {
+ private static Class<?> forName0(String arg1, boolean arg2, ClassLoader arg3)
+ throws ClassNotFoundException {
return (arg3 == null) ? VmSystem.forName(arg1) : arg3.loadClass(arg1, arg2);
}
+
/**
* @see java.lang.Class#isInstance(java.lang.Object)
*/
- private static boolean isInstance(Class instance, Object arg1) {
+ private static boolean isInstance(Class<?> instance, Object arg1) {
return SoftByteCodes.isInstanceof(arg1, getLinkedVmClass(instance));
}
+
/**
* @see java.lang.Class#isAssignableFrom(java.lang.Class)
*/
- private static boolean isAssignableFrom(Class instance, Class arg1) {
+ private static boolean isAssignableFrom(Class<?> instance, Class<?> arg1) {
return getLinkedVmClass(instance).isAssignableFrom(getLinkedVmClass(arg1));
}
+
/**
* @see java.lang.Class#isInterface()
*/
- private static boolean isInterface(Class instance) {
+ private static boolean isInterface(Class<?> instance) {
return VmType.fromClass(instance).isInterface();
}
+
/**
* @see java.lang.Class#isArray()
*/
- private static boolean isArray(Class instance) {
+ private static boolean isArray(Class<?> instance) {
return VmType.fromClass(instance).isArray();
}
+
/**
* @see java.lang.Class#isPrimitive()
*/
- private static boolean isPrimitive(Class instance) {
+ private static boolean isPrimitive(Class<?> instance) {
return VmType.fromClass(instance).isPrimitive();
}
+
/**
* @see java.lang.Class#getName0()
*/
- private static String getName0(Class instance) {
+ private static String getName0(Class<?> instance) {
return VmType.fromClass(instance).getName().replace('/', '.');
}
+
/**
* @see java.lang.Class#getClassLoader0()
*/
- private static ClassLoader getClassLoader0(Class instance) {
+ private static ClassLoader getClassLoader0(Class<?> instance) {
VmClassLoader loader = VmType.fromClass(instance).getLoader();
return loader.isSystemClassLoader() ? null : loader.asClassLoader();
}
+
/**
* @see java.lang.Class#getSuperclass()
*/
- private static <T> Class getSuperclass(Class instance) {
+ private static <T> Class<?> getSuperclass(Class<T> instance) {
VmType<T> vmType = getLinkedVmClass(instance);
-
- if(vmType.isPrimitive() || vmType.isInterface())
+
+ if (vmType.isPrimitive() || vmType.isInterface()) {
return null;
-
+ }
VmType< ? super T> superCls = vmType.getSuperClass();
if (superCls != null) {
return superCls.asClass();
@@ -113,12 +123,13 @@
return null;
}
}
+
/**
* @see java.lang.Class#getInterfaces()
*/
- private static <T> Class[] getInterfaces(Class instance) {
+ private static <T> Class<?>[] getInterfaces(Class<T> instance) {
// if (interfaces == null) {
- final ArrayList<Class> list = new ArrayList<Class>();
+ final ArrayList<Class<?>> list = new ArrayList<Class<?>>();
final VmType<T> vmClass = getLinkedVmClass(instance);
final int cnt = vmClass.getNoInterfaces();
for (int i = 0; i < cnt; i++) {
@@ -129,10 +140,11 @@
// return (Class[]) interfaces.toArray(new Class[interfaces.size()]);
return list.toArray(new Class[list.size()]);
}
+
/**
* @see java.lang.Class#getComponentType()
*/
- private static <T> Class getComponentType(Class instance) {
+ private static <T> Class<?> getComponentType(Class<T> instance) {
final VmType<T> vmClass = getLinkedVmClass(instance);
if (vmClass instanceof VmArrayClass) {
final VmType< ? > vmCompType = ((VmArrayClass<T>) vmClass)
@@ -143,43 +155,49 @@
}
return null;
}
+
/**
* @see java.lang.Class#getModifiers()
*/
- private static int getModifiers(Class instance) {
+ private static int getModifiers(Class<?> instance) {
return VmType.fromClass(instance).getAccessFlags();
}
+
/**
* @see java.lang.Class#getSigners()
*/
- private static Object[] getSigners(Class instance) {
+ private static Object[] getSigners(Class<?> instance) {
//todo implement it
return null;
}
+
/**
* @see java.lang.Class#setSigners(java.lang.Object[])
*/
- private static void setSigners(Class instance, Object[] arg1) {
+ private static void setSigners(Class<?> instance, Object[] arg1) {
//todo implement it
}
+
/**
* @see java.lang.Class#getEnclosingMethod0()
*/
- private static Object[] getEnclosingMethod0(Class instance) {
+ private static Object[] getEnclosingMethod0(Class<?> instance) {
//todo implement it
return null;
}
+
/**
* @see java.lang.Class#getDeclaringClass()
*/
- private static Class getDeclaringClass(Class instance) {
+ private static Class<?> getDeclaringClass(Class<?> instance) {
//todo implement it
return null;
}
+
/**
* @see java.lang.Class#getProtectionDomain0()
*/
- private static ProtectionDomain getProtectionDomain0(Class instance) {
+ private static ProtectionDomain getProtectionDomain0(Class<?> instance) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPermission(new RuntimePermission("getProtectionDomain"));
@@ -191,16 +209,18 @@
return getUnknownProtectionDomain();
}
}
+
/**
* @see java.lang.Class#setProtectionDomain0(java.security.ProtectionDomain)
*/
- private static void setProtectionDomain0(Class instance, ProtectionDomain arg1) {
+ private static void setProtectionDomain0(Class<?> instance, ProtectionDomain arg1) {
//todo implement it
}
+
/**
* @see java.lang.Class#getPrimitiveClass(java.lang.String)
*/
- private static Class getPrimitiveClass(String type) {
+ private static Class<?> getPrimitiveClass(String type) {
if(type.equals("double"))
return getPrimitiveClass('D');
else if(type.equals("float"))
@@ -222,30 +242,34 @@
else
throw new IllegalArgumentException("Unknown type " + type);
}
+
/**
* @see java.lang.Class#getGenericSignature()
*/
- private static String getGenericSignature(Class instance) {
+ private static String getGenericSignature(Class<?> instance) {
return VmType.fromClass(instance).getSignature();
}
+
/**
* @see java.lang.Class#getRawAnnotations()
*/
- private static byte[] getRawAnnotations(Class instance) {
+ private static byte[] getRawAnnotations(Class<?> instance) {
//todo implement it
return null;
}
+
/**
* @see java.lang.Class#getConstantPool()
*/
- private static ConstantPool getConstantPool(Class instance) {
+ private static ConstantPool getConstantPool(Class<?> instance) {
//todo implement it
return null;
}
+
/**
* @see java.lang.Class#getDeclaredFields0(boolean)
*/
- private static <T> Field[] getDeclaredFields0(Class instance, boolean publicOnly) {
+ private static <T> Field[] getDeclaredFields0(Class<T> instance, boolean publicOnly) {
//todo optimize , simplify
Field[] declaredFields;
{
@@ -274,10 +298,11 @@
return declaredFields;
}
}
+
/**
* @see java.lang.Class#getDeclaredMethods0(boolean)
*/
- private static <T> Method[] getDeclaredMethods0(Class instance, boolean publicOnly) {
+ private static <T> Method[] getDeclaredMethods0(Class<T> instance, boolean publicOnly) {
final VmType<T> vmClass = getLinkedVmClass(instance);
final int cnt = vmClass.getNoDeclaredMethods();
int max = 0;
@@ -299,51 +324,55 @@
}
return list;
}
+
/**
* @see java.lang.Class#getDeclaredConstructors0(boolean)
*/
- private static <T> Constructor[] getDeclaredConstructors0(Class instance, boolean arg1) {
+ private static <T> Constructor<?>[] getDeclaredConstructors0(Class<T> instance, boolean arg1) {
//todo fix public only !!!
- final VmType<T> vmClass = getLinkedVmClass(instance);
- int cnt = vmClass.getNoDeclaredMethods();
- int max = 0;
- for (int i = 0; i < cnt; i++) {
- if (vmClass.getDeclaredMethod(i).isConstructor()) {
- max++;
- }
+ final VmType<T> vmClass = getLinkedVmClass(instance);
+ int cnt = vmClass.getNoDeclaredMethods();
+ int max = 0;
+ for (int i = 0; i < cnt; i++) {
+ if (vmClass.getDeclaredMethod(i).isConstructor()) {
+ max++;
}
- Constructor[] list = new Constructor[max];
- max = 0;
- for (int i = 0; i < cnt; i++) {
- VmMethod vmMethod = vmClass.getDeclaredMethod(i);
- if (vmMethod.isConstructor()) {
- list[max++] = (Constructor) vmMethod.asMember();
- }
+ }
+ Constructor<?>[] list = new Constructor[max];
+ max = 0;
+ for (int i = 0; i < cnt; i++) {
+ VmMethod vmMethod = vmClass.getDeclaredMethod(i);
+ if (vmMethod.isConstructor()) {
+ list[max++] = (Constructor<?>) vmMethod.asMember();
}
+ }
return list;
}
+
/**
* @see java.lang.Class#getDeclaredClasses0()
*/
- private static Class[] getDeclaredClasses0(Class instance) {
+ private static Class<?>[] getDeclaredClasses0(Class<?> instance) {
//todo implement it
return new Class[0];
}
+
/**
* @see java.lang.Class#desiredAssertionStatus0(java.lang.Class)
*/
- private static boolean desiredAssertionStatus0(Class arg1) {
+ private static boolean desiredAssertionStatus0(Class<?> arg1) {
//todo implement it
return false;
}
- private static <T> VmType<T> getLinkedVmClass(Class clazz) {
- final VmType vmClass = VmType.fromClass(clazz);
+ private static <T> VmType<T> getLinkedVmClass(Class<T> clazz) {
+ final VmType<T> vmClass = VmType.fromClass(clazz);
vmClass.link();
return vmClass;
}
private static ProtectionDomain unknownProtectionDomain;
+
/**
* Gets the unknown protection domain. Create on demand.
*
@@ -358,7 +387,7 @@
return unknownProtectionDomain;
}
- static Class getPrimitiveClass(char type) {
+ static Class<?> getPrimitiveClass(char type) {
return VmType.getPrimitiveClass(type).asClass();
}
}
Modified: trunk/core/src/openjdk/vm/java/lang/NativeStrictMath.java
===================================================================
--- trunk/core/src/openjdk/vm/java/lang/NativeStrictMath.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/lang/NativeStrictMath.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -53,8 +53,6 @@
import gnu.classpath.Configuration;
-import java.util.Random;
-
/**
* Helper class containing useful mathematical functions and constants.
* This class mirrors {@link Math}, but is 100% portable, because it uses
Modified: trunk/core/src/openjdk/vm/java/lang/reflect/NativeArray.java
===================================================================
--- trunk/core/src/openjdk/vm/java/lang/reflect/NativeArray.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/lang/reflect/NativeArray.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -285,7 +285,7 @@
/**
* @see java.lang.reflect.Array#newArray(java.lang.Class, int)
*/
- private static Object newArray(Class arg1, int arg2) {
+ private static Object newArray(Class<?> arg1, int arg2) {
if (!((Class<?>) arg1).isPrimitive())
return createObjectArray((Class<?>) arg1, arg2);
if ((Class<?>) arg1 == boolean.class)
@@ -311,32 +311,32 @@
/**
* @see java.lang.reflect.Array#multiNewArray(java.lang.Class, int[])
*/
- private static Object multiNewArray(Class arg1, int[] arg2) {
+ private static Object multiNewArray(Class<?> arg1, int[] arg2) {
if (arg2.length <= 0)
throw new IllegalArgumentException("Empty dimensions array.");
if (arg2.length - 1 == 0)
return newInstance((Class<?>) arg1, arg2[0]);
- Object toAdd = createMultiArray((Class) (Class<?>) arg1, arg2, arg2.length - 1 - 1);
- Class thisType = toAdd.getClass();
+ Object toAdd = createMultiArray((Class<?>) arg1, arg2, arg2.length - 1 - 1);
+ Class<?> thisType = toAdd.getClass();
Object[] retval
= (Object[]) createObjectArray(thisType, arg2[(arg2.length - 1)]);
if (arg2[(arg2.length - 1)] > 0)
retval[0] = toAdd;
int i = arg2[(arg2.length - 1)];
while (--i > 0)
- retval[i] = createMultiArray((Class) (Class<?>) arg1, arg2, arg2.length - 1 - 1);
+ retval[i] = createMultiArray((Class<?>) arg1, arg2, arg2.length - 1 - 1);
return retval;
}
- static Object createMultiArray(Class type, int[] dimensions,
+ static Object createMultiArray(Class<?> type, int[] dimensions,
int index) {
if (index == 0)
return newInstance(type, dimensions[0]);
Object toAdd = createMultiArray(type, dimensions, index - 1);
- Class thisType = toAdd.getClass();
+ Class<?> thisType = toAdd.getClass();
Object[] retval
= (Object[]) createObjectArray(thisType, dimensions[index]);
if (dimensions[index] > 0)
@@ -391,16 +391,16 @@
* @throws NegativeArraySizeException if dim is negative
* @throws OutOfMemoryError if memory allocation fails
*/
- static Object createObjectArray(final Class type, int dim) {
- final VmType vmClass = AccessController.doPrivileged(
- new PrivilegedAction<VmType>() {
- public VmType run() {
+ static Object createObjectArray(final Class<?> type, int dim) {
+ final VmType<?> vmClass = AccessController.doPrivileged(
+ new PrivilegedAction<VmType<?>>() {
+ public VmType<?> run() {
return VmType.fromClass(type);
}
});
final String arrClsName = vmClass.getArrayClassName();
- final VmType arrCls;
+ final VmType<?> arrCls;
try {
final VmClassLoader curLoader = vmClass.getLoader();
arrCls = curLoader.loadClass(arrClsName, true);
@@ -411,7 +411,7 @@
throw new NoClassDefFoundError(arrClsName);
}
- return Vm.getHeapManager().newArray((VmArrayClass) arrCls, dim);
+ return Vm.getHeapManager().newArray((VmArrayClass<?>) arrCls, dim);
}
}
Modified: trunk/core/src/openjdk/vm/java/lang/reflect/NativeProxy.java
===================================================================
--- trunk/core/src/openjdk/vm/java/lang/reflect/NativeProxy.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/lang/reflect/NativeProxy.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -29,9 +29,9 @@
/**
* @see java.lang.reflect.Proxy#defineClass0(ClassLoader, String, byte[], int, int)
*/
- private static Class defineClass0(ClassLoader loader, String name,
+ private static Class<?> defineClass0(ClassLoader loader, String name,
byte[] b, int off, int len){
- if(loader == null)
+ if (loader == null)
loader = Thread.currentThread().getContextClassLoader();
return ((VmClassLoader)loader.getVmClassLoader()).
defineClass(name, b, off, len, Object.class.getProtectionDomain()).asClass();
Modified: trunk/core/src/openjdk/vm/java/util/NativeResourceBundle.java
===================================================================
--- trunk/core/src/openjdk/vm/java/util/NativeResourceBundle.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/util/NativeResourceBundle.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -26,10 +26,11 @@
* @author Levente S\u00e1ntha
*/
class NativeResourceBundle {
- static Class[] getClassContext(){
+
+ static Class<?>[] getClassContext(){
//skip the call to VmSystem.getRealClassContext()
- Class[] context = VmSystem.getRealClassContext();
- Class[] ret = new Class[context.length - 2];
+ Class<?>[] context = VmSystem.getRealClassContext();
+ Class<?>[] ret = new Class[context.length - 2];
System.arraycopy(context, 2, ret, 0, ret.length);
return ret;
Modified: trunk/core/src/openjdk/vm/java/util/jar/NativeJarFile.java
===================================================================
--- trunk/core/src/openjdk/vm/java/util/jar/NativeJarFile.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/java/util/jar/NativeJarFile.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -14,10 +14,11 @@
private static String[] getMetaInfEntryNames(JarFile instance) {
ArrayList<String> ret = new ArrayList<String>();
- for (Enumeration e = instance.entries(); e.hasMoreElements(); ) {
+ for (Enumeration<?> e = instance.entries(); e.hasMoreElements(); ) {
String name = ((ZipEntry) e.nextElement()).getName();
- if (name.startsWith("META-INF/"))
+ if (name.startsWith("META-INF/")) {
ret.add(name);
+ }
}
return ret.isEmpty() ? null : ret.toArray(new String[ret.size()]);
Modified: trunk/core/src/openjdk/vm/sun/awt/image/NativeBufImgSurfaceData.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/awt/image/NativeBufImgSurfaceData.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/awt/image/NativeBufImgSurfaceData.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -30,15 +30,19 @@
/**
* @see sun.awt.image.BufImgSurfaceData#initIDs(Class)
*/
- private static void initIDs(Class arg1) {
+ private static void initIDs(Class<?> arg1) {
//todo implement it
}
+
/**
* @see sun.awt.image.BufImgSurfaceData#initRaster(java.lang.Object, int, int, int, int, int, int, java.awt.image.IndexColorModel)
*/
- private static void initRaster(BufImgSurfaceData instance, Object arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, IndexColorModel arg8) {
+ private static void initRaster(BufImgSurfaceData instance,
+ Object arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7,
+ IndexColorModel arg8) {
//todo implement it
}
+
/**
* @see sun.awt.image.BufImgSurfaceData#freeNativeICMData(java.awt.image.IndexColorModel)
*/
Modified: trunk/core/src/openjdk/vm/sun/awt/image/NativeJPEGImageDecoder.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/awt/image/NativeJPEGImageDecoder.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/awt/image/NativeJPEGImageDecoder.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -30,9 +30,10 @@
/**
* @see sun.awt.image.JPEGImageDecoder#initIDs(java.lang.Class)
*/
- private static void initIDs(Class arg1) {
+ private static void initIDs(Class<?> arg1) {
//todo implement it
}
+
/**
* @see sun.awt.image.JPEGImageDecoder#readImage(java.io.InputStream, byte[])
*/
Modified: trunk/core/src/openjdk/vm/sun/font/NativeFontManager.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/font/NativeFontManager.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/font/NativeFontManager.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -38,12 +38,14 @@
private static void initIDs() {
//todo implement it
}
+
/**
* @see sun.font.FontManager#setFont2D(java.awt.Font, sun.font.Font2DHandle)
*/
private static void setFont2D(Font arg1, Font2DHandle arg2) {
//todo implement it
}
+
/**
* @see sun.font.FontManager#isCreatedFont(java.awt.Font)
*/
@@ -51,18 +53,22 @@
//todo implement it
return false;
}
+
/**
* @see sun.font.FontManager#setCreatedFont(java.awt.Font)
*/
private static void setCreatedFont(Font arg1) {
//todo implement it
}
+
/**
* @see sun.font.FontManager#populateFontFileNameMap(java.util.HashMap, java.util.HashMap, java.util.HashMap, java.util.Locale)
*/
- private static void populateFontFileNameMap(HashMap arg1, HashMap arg2, HashMap arg3, Locale arg4) {
+ private static void populateFontFileNameMap(
+ HashMap<?, ?> arg1, HashMap<?, ?> arg2, HashMap<?, ?> arg3, Locale arg4) {
//todo implement it
}
+
/**
* @see sun.font.FontManager#getFont2D(java.awt.Font)
*/
Modified: trunk/core/src/openjdk/vm/sun/font/NativeFreetypeFontScaler.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/font/NativeFreetypeFontScaler.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/font/NativeFreetypeFontScaler.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -31,71 +31,93 @@
/**
* @see sun.font.FreetypeFontScaler#initIDs(java.lang.Class)
*/
- private static void initIDs(Class arg1) {
+ private static void initIDs(Class<?> arg1) {
//todo implement it
}
+
/**
* @see sun.font.FreetypeFontScaler#initNativeScaler(sun.font.Font2D, int, int, boolean, int)
*/
- private static long initNativeScaler(FreetypeFontScaler instance, Font2D arg1, int arg2, int arg3, boolean arg4, int arg5) {
+ private static long initNativeScaler(
+ FreetypeFontScaler instance, Font2D arg1, int arg2, int arg3, boolean arg4, int arg5) {
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#getFontMetricsNative(sun.font.Font2D, long, long)
*/
- private static StrikeMetrics getFontMetricsNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3) {
+ private static StrikeMetrics getFontMetricsNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3) {
//todo implement it
return null;
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphAdvanceNative(sun.font.Font2D, long, long, int)
*/
- private static float getGlyphAdvanceNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4) {
+ private static float getGlyphAdvanceNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4) {
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphMetricsNative(sun.font.Font2D, long, long, int, java.awt.geom.Point2D.Float)
*/
- private static void getGlyphMetricsNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4, Point2D.Float arg5) {
+ private static void getGlyphMetricsNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4,
+ Point2D.Float arg5) {
//todo implement it
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphImageNative(sun.font.Font2D, long, long, int)
*/
- private static long getGlyphImageNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4) {
+ private static long getGlyphImageNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4) {
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphOutlineBoundsNative(sun.font.Font2D, long, long, int)
*/
- private static Rectangle2D.Float getGlyphOutlineBoundsNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4) {
+ private static Rectangle2D.Float getGlyphOutlineBoundsNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4) {
//todo implement it
return null;
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphOutlineNative(sun.font.Font2D, long, long, int, float, float)
*/
- private static GeneralPath getGlyphOutlineNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4, float arg5, float arg6) {
+ private static GeneralPath getGlyphOutlineNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4,
+ float arg5, float arg6) {
//todo implement it
return null;
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphVectorOutlineNative(sun.font.Font2D, long, long, int[], int, float, float)
*/
- private static GeneralPath getGlyphVectorOutlineNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int[] arg4, int arg5, float arg6, float arg7) {
+ private static GeneralPath getGlyphVectorOutlineNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int[] arg4,
+ int arg5, float arg6, float arg7) {
//todo implement it
return null;
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphPointNative(sun.font.Font2D, long, long, int, int)
*/
- private static Point2D.Float getGlyphPointNative(FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4, int arg5) {
+ private static Point2D.Float getGlyphPointNative(
+ FreetypeFontScaler instance, Font2D arg1, long arg2, long arg3, int arg4, int arg5) {
//todo implement it
return null;
}
+
/**
* @see sun.font.FreetypeFontScaler#getLayoutTableCacheNative(long)
*/
@@ -103,12 +125,14 @@
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#disposeNativeScaler(long)
*/
private static void disposeNativeScaler(FreetypeFontScaler instance, long arg1) {
//todo implement it
}
+
/**
* @see sun.font.FreetypeFontScaler#getGlyphCodeNative(long, char)
*/
@@ -116,6 +140,7 @@
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#getNumGlyphsNative(long)
*/
@@ -123,6 +148,7 @@
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#getMissingGlyphCodeNative(long)
*/
@@ -130,6 +156,7 @@
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#getUnitsPerEMNative(long)
*/
@@ -137,6 +164,7 @@
//todo implement it
return 0;
}
+
/**
* @see sun.font.FreetypeFontScaler#createScalerContextNative(long, double[], boolean, int, int, float, float)
*/
Modified: trunk/core/src/openjdk/vm/sun/java2d/loops/NativeGraphicsPrimitiveMgr.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/java2d/loops/NativeGraphicsPrimitiveMgr.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/java2d/loops/NativeGraphicsPrimitiveMgr.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -27,9 +27,13 @@
/**
* @see sun.java2d.loops.GraphicsPrimitiveMgr#initIDs(java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class, java.lang.Class)
*/
- private static void initIDs(Class arg1, Class arg2, Class arg3, Class arg4, Class arg5, Class arg6, Class arg7, Class arg8, Class arg9, Class arg10, Class arg11) {
+ private static void initIDs(
+ Class<?> arg1, Class<?> arg2, Class<?> arg3, Class<?> arg4, Class<?> arg5,
+ Class<?> arg6, Class<?> arg7, Class<?> arg8, Class<?> arg9, Class<?> arg10,
+ Class<?> arg11) {
//todo implement it
}
+
/**
* @see sun.java2d.loops.GraphicsPrimitiveMgr#registerNativeLoops()
*/
Modified: trunk/core/src/openjdk/vm/sun/java2d/pipe/NativeSpanClipRenderer.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/java2d/pipe/NativeSpanClipRenderer.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/java2d/pipe/NativeSpanClipRenderer.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -28,19 +28,23 @@
/**
* @see sun.java2d.pipe.SpanClipRenderer#initIDs(java.lang.Class, java.lang.Class)
*/
- private static void initIDs(Class arg1, Class arg2) {
+ private static void initIDs(Class<?> arg1, Class<?> arg2) {
//todo implement it
}
+
/**
* @see sun.java2d.pipe.SpanClipRenderer#fillTile(sun.java2d.pipe.RegionIterator, byte[], int, int, int[])
*/
- private static void fillTile(SpanClipRenderer instance, RegionIterator arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+ private static void fillTile(SpanClipRenderer instance, RegionIterator arg1,
+ byte[] arg2, int arg3, int arg4, int[] arg5) {
//todo implement it
}
+
/**
* @see sun.java2d.pipe.SpanClipRenderer#eraseTile(sun.java2d.pipe.RegionIterator, byte[], int, int, int[])
*/
- private static void eraseTile(SpanClipRenderer instance, RegionIterator arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+ private static void eraseTile(SpanClipRenderer instance, RegionIterator arg1,
+ byte[] arg2, int arg3, int arg4, int[] arg5) {
//todo implement it
}
}
Modified: trunk/core/src/openjdk/vm/sun/misc/NativeUnsafe.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/misc/NativeUnsafe.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/misc/NativeUnsafe.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -441,18 +441,18 @@
return vmClass.getDeclaredField(f.getSlot());
}
- public static void ensureClassInitialized(Unsafe instance, Class c) {
+ public static void ensureClassInitialized(Unsafe instance, Class<?> c) {
VmType.fromClass(c).initialize();
}
- public static int arrayBaseOffset(Unsafe instance, Class arrayClass) {
+ public static int arrayBaseOffset(Unsafe instance, Class<?> arrayClass) {
return VmArray.DATA_OFFSET * VmProcessor.current().getArchitecture().getReferenceSize();
}
- public static int arrayIndexScale(Unsafe instance, Class arrayClass) {
+ public static int arrayIndexScale(Unsafe instance, Class<?> arrayClass) {
//see VmHeapManager.newArray()
final int elemSize;
- VmType arrayCls = VmType.fromClass(arrayClass);
+ VmType<?> arrayCls = VmType.fromClass(arrayClass);
if (arrayCls.isPrimitiveArray()) {
switch (arrayCls.getSecondNameChar()) {
case 'B': // byte
@@ -488,9 +488,8 @@
throw new UnsupportedOperationException();
}
- public static Class defineClass(Unsafe instance, String name, byte[] b, int off, int len,
- ClassLoader loader,
- ProtectionDomain protDomain) {
+ public static Class<?> defineClass(Unsafe instance, String name, byte[] b, int off, int len,
+ ClassLoader loader, ProtectionDomain protDomain) {
if (protDomain == null) {
protDomain = AccessController
.doPrivileged(new PrivilegedAction<ProtectionDomain>() {
@@ -501,15 +500,16 @@
}
});
}
- return ((VmClassLoader)loader.getVmClassLoader()).defineClass(name, b, off, len, protDomain).asClass();
+ return ((VmClassLoader) loader.getVmClassLoader()).
+ defineClass(name, b, off, len, protDomain).asClass();
}
- public static Class defineClass(Unsafe instance, String name, byte[] b, int off, int len) {
+ public static Class<?> defineClass(Unsafe instance, String name, byte[] b, int off, int len) {
throw new UnsupportedOperationException();
}
- public static Object allocateInstance(Unsafe instance, Class cls)
+ public static Object allocateInstance(Unsafe instance, Class<?> cls)
throws InstantiationException {
//todo improve exception handling
try {
Modified: trunk/core/src/openjdk/vm/sun/reflect/NativeConstantPool.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/reflect/NativeConstantPool.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/reflect/NativeConstantPool.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -31,11 +31,11 @@
throw new UnsupportedOperationException();
}
- private static Class getClassAt0(ConstantPool instance, Object constantPoolOop, int index) {
+ private static Class<?> getClassAt0(ConstantPool instance, Object constantPoolOop, int index) {
throw new UnsupportedOperationException();
}
- private static Class getClassAtIfLoaded0(ConstantPool instance, Object constantPoolOop, int index) {
+ private static Class<?> getClassAtIfLoaded0(ConstantPool instance, Object constantPoolOop, int index) {
throw new UnsupportedOperationException();
}
Modified: trunk/core/src/openjdk/vm/sun/reflect/NativeNativeConstructorAccessorImpl.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/reflect/NativeNativeConstructorAccessorImpl.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/reflect/NativeNativeConstructorAccessorImpl.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -33,10 +33,10 @@
/**
* @see sun.reflect.NativeConstructorAccessorImpl#newInstance0(java.lang.reflect.Constructor, java.lang.Object[])
*/
- private static Object newInstance0(Constructor arg1, Object[] arg2) throws InstantiationException,
+ private static Object newInstance0(Constructor<?> arg1, Object[] arg2) throws InstantiationException,
IllegalArgumentException,
InvocationTargetException{
- VmType vmt = VmType.fromClass(arg1.getDeclaringClass());
+ VmType<?> vmt = VmType.fromClass(arg1.getDeclaringClass());
VmMethod vmm = vmt.getDeclaredMethod(arg1.getSlot());
try {
return VmReflection.newInstance(vmm, arg2);
Modified: trunk/core/src/openjdk/vm/sun/reflect/NativeNativeMethodAccessorImpl.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/reflect/NativeNativeMethodAccessorImpl.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/reflect/NativeNativeMethodAccessorImpl.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -35,7 +35,7 @@
*/
private static Object invoke0(Method arg1, Object arg2, Object[] arg3) throws IllegalArgumentException,
InvocationTargetException {
- VmType vmt = VmType.fromClass((Class<?>) arg1.getDeclaringClass());
+ VmType<?> vmt = VmType.fromClass((Class<?>) arg1.getDeclaringClass());
VmMethod vmm = vmt.getDeclaredMethod(arg1.getSlot());
return VmReflection.invoke(vmm, arg2, arg3);
}
Modified: trunk/core/src/openjdk/vm/sun/reflect/NativeReflection.java
===================================================================
--- trunk/core/src/openjdk/vm/sun/reflect/NativeReflection.java 2009-04-18 15:03:26 UTC (rev 5306)
+++ trunk/core/src/openjdk/vm/sun/reflect/NativeReflection.java 2009-04-18 15:07:04 UTC (rev 5307)
@@ -34,7 +34,7 @@
* @return
* @see Reflection#getCallerClass(int)
*/
- static Class getCallerClass(int realFramesToSkip){
+ static Class<?> getCallerClass(int realFramesToSkip){
// using realFramesToSkip + 1 to skip VmSystem
return VmSystem.getRealClassContext()[realFramesToSkip + 1];
}
@@ -45,7 +45,7 @@
* @return
* @see Reflection#getClassAccessFlags(Class)
*/
- static int getClassAccessFlags(Class c) {
+ static int getClassAccessFlags(Class<?> c) {
return VmType.fromClass(c).getAccessFlags();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
