diff options
| -rw-r--r-- | bean/test/applet/oooapplet/OOoViewer.java | 4 | ||||
| -rw-r--r-- | bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java | 2 | ||||
| -rw-r--r-- | odk/source/com/sun/star/lib/loader/Loader.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java index f2571bae7a1f..933df3c15ebe 100644 --- a/bean/test/applet/oooapplet/OOoViewer.java +++ b/bean/test/applet/oooapplet/OOoViewer.java @@ -132,7 +132,7 @@ final class CustomURLClassLoader extends URLClassLoader { } @Override - protected Class findClass( String name ) throws ClassNotFoundException { + protected Class<?> findClass( String name ) throws ClassNotFoundException { // This is only called via this.loadClass -> super.loadClass -> // this.findClass, after this.loadClass has already called // super.findClass, so no need to call super.findClass again: @@ -142,7 +142,7 @@ final class CustomURLClassLoader extends URLClassLoader { @Override - protected Class loadClass( String name, boolean resolve ) + protected Class<?> loadClass( String name, boolean resolve ) throws ClassNotFoundException { Class c = findLoadedClass( name ); diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java index d3a7425d83c6..732d30b925b5 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java @@ -150,7 +150,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler Object proxy, java.lang.reflect.Method method, Object args [] ) throws Throwable { - Class decl_class = method.getDeclaringClass(); + Class<?> decl_class = method.getDeclaringClass(); String method_name = method.getName(); if (Object.class.equals( decl_class )) diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index 908e3f03bcf4..4982bf3a2e79 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -299,7 +299,7 @@ public final class Loader { } @Override - protected Class findClass( String name ) throws ClassNotFoundException { + protected Class<?> findClass( String name ) throws ClassNotFoundException { // This is only called via this.loadClass -> super.loadClass -> // this.findClass, after this.loadClass has already called // super.findClass, so no need to call super.findClass again: @@ -307,7 +307,7 @@ public final class Loader { } @Override - protected Class loadClass( String name, boolean resolve ) + protected Class<?> loadClass( String name, boolean resolve ) throws ClassNotFoundException { Class c = findLoadedClass( name ); |