diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:38:38 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:38:38 +0000 |
commit | 8a67eff26a6490003d89972bd9688d2252b8834c (patch) | |
tree | 5ebbf1cc0d849d7abe64434eb473cf838f5c12a6 /odk/source | |
parent | b9d50a0b30adce22eaac8274246894f8921d779a (diff) |
INTEGRATION: CWS tbe13 (1.2.24); FILE MERGED
2004/09/23 14:25:58 tbe 1.2.24.1: #i34010# Loader.java does not compile with jdk1.5
Diffstat (limited to 'odk/source')
-rw-r--r-- | odk/source/com/sun/star/lib/loader/Loader.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index f298f8155162..2cd3812b269f 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -2,9 +2,9 @@ * * $RCSfile: Loader.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2004-05-28 15:50:54 $ + * last change: $Author: obo $ $Date: 2004-11-15 13:38:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,9 +106,9 @@ public final class Loader { ClassLoader loader = clazz.getClassLoader(); Vector res = new Vector(); try { - Enumeration enum = loader.getResources( "META-INF/MANIFEST.MF" ); - while ( enum.hasMoreElements() ) { - res.add( (URL) enum.nextElement() ); + Enumeration en = loader.getResources( "META-INF/MANIFEST.MF" ); + while ( en.hasMoreElements() ) { + res.add( (URL) en.nextElement() ); } // the jarfile with the com/sun/star/lib/loader/Loader.class // per-entry attribute is most probably the last resource in the @@ -223,8 +223,8 @@ public final class Loader { ClassLoader cl = new CustomURLClassLoader( clurls ); Class c = cl.loadClass( "com.sun.star.comp.helper.UnoInfo" ); - Method m = c.getMethod( "getJars", null ); - URL[] jarurls = (URL[]) m.invoke( null, null ); + Method m = c.getMethod( "getJars", (Class[]) null ); + URL[] jarurls = (URL[]) m.invoke( null, (Object[]) null ); for ( int i = 0; i < jarurls.length; i++ ) { vec.add( jarurls[i] ); } |