INTEGRATION: CWS tbe25 (1.3.4); FILE MERGED

2005/10/27 13:12:01 sb 1.3.4.1: #i56785# Added ctor with extraTypes; fixed @since tag.

1 files changed, 32 insertions, 5 deletions

diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
index 58238a2a3805..304cd3510f42 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: UnoClassLoader.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 13:25:49 $
+ *  last change: $Author: obo $ $Date: 2006-01-20 10:10:25 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -56,10 +56,9 @@ import java.util.jar.JarInputStream;
  * types, and any additional UNO types introduced by components; for the latter,
  * {@link #addURL} may be necessary).</p>
  *
- * <p><em>This is an internal, unstable class of the Uno Runtime Environment; it
- * should not be used by client code.</em></p>
+ * <p><em>This class is not yet stable.</em></p>
  *
- * @since UDK 3.2.1
+ * @since UDK 3.2.0
  */
 public final class UnoClassLoader extends URLClassLoader {
     /**
@@ -86,6 +85,34 @@ public final class UnoClassLoader extends URLClassLoader {
     }
 
     /**
+     * Instantiates the root UNO class loader, passing it locations of
+     * additional UNO types.
+     *
+     * @param base a base URL relative to which the URE JARs
+     * (<code>java_uno.jar</code>, <code>juh.jar</code>, <code>jurt.jar</code>,
+     * <code>ridl.jar</code>) can be found; must not be <code>null</code>.
+     *
+     * @param parent the parent class loader for delegation.
+     *
+     * @param extraTypes a (possibly empty) array of URLs through which Java
+     * classes representing additional UNO types can be found; must not be
+     * <code>null</code>.
+     *
+     * @throws MalformedURLException if the given <code>base</code> URL is
+     * malformed.
+     *
+     * @since UDK 3.2.2
+     */
+    public UnoClassLoader(URL base, ClassLoader parent, URL[] extraTypes)
+        throws MalformedURLException
+    {
+        this(base, parent);
+        for (int i = 0; i < extraTypes.length; ++i) {
+            addURL(extraTypes[i]);
+        }
+    }
+
+    /**
      * Obtains a class loader for a UNO JAR.
      *
      * @param jar the URL of a UNO JAR; must not be <code>null</code>.