fixed doArgs (Settings.scala) and loadFrom (Plu...

fixed doArgs (Settings.scala) and loadFrom (Plugin.scala)

1 files changed, 20 insertions, 17 deletions

diff --git a/src/compiler/scala/tools/nsc/plugins/Plugin.scala b/src/compiler/scala/tools/nsc/plugins/Plugin.scala
index 2b61724c49..50bd52d3fa 100644
--- a/src/compiler/scala/tools/nsc/plugins/Plugin.scala
+++ b/src/compiler/scala/tools/nsc/plugins/Plugin.scala
@@ -63,8 +63,8 @@ abstract class Plugin {
  *  @author Lex Spoon
  *  @version 1.0, 2007-5-21
  */
-object Plugin
-{
+object Plugin {
+
   private val PluginXML = "scalac-plugin.xml"
 
   /** Create a class loader with the specified file plus
@@ -78,7 +78,8 @@ object Plugin
   }
 
   /** Try to load a plugin description from the specified
-   *  file, returning None if it does not work. */
+   *  file, returning <code>None</code> if it does not work.
+   */
   private def loadDescription(jarfile: Path): Option[PluginDescription] =
     // XXX Return to this once we have some ARM support
     if (!jarfile.exists) None
@@ -86,9 +87,9 @@ object Plugin
       val jar = new JarFile(jarfile.jfile)
 
       try {
-        (jar getEntry PluginXML) match {
-          case null   => None
-          case entry  =>
+        jar getEntry PluginXML match {
+          case null  => None
+          case entry =>
             val in = jar getInputStream entry
             val packXML = XML load in
             in.close()
@@ -104,19 +105,21 @@ object Plugin
 
   type AnyClass = Class[_]
 
-  /** Loads a plugin class from the named jar file.  Returns None
-   *  if the jar file has no plugin in it or if the plugin
-   *  is badly formed.
-   */
-  def loadFrom(jarfile: Path, loader: ClassLoader): Option[AnyClass] = {
-    val pluginInfo = loadDescription(jarfile).get
+  /** Loads a plugin class from the named jar file.
 
-    try Some(loader loadClass pluginInfo.classname) catch {
-      case _: ClassNotFoundException =>
-        println("Warning: class not found for plugin in %s (%s)".format(jarfile, pluginInfo.classname))
-        None
+   *  @return <code>None</code> if the jar file has no plugin in it or
+   *                            if the plugin is badly formed.
+   */
+  def loadFrom(jarfile: Path, loader: ClassLoader): Option[AnyClass] =
+    loadDescription(jarfile) match {
+      case None => None
+      case Some(pdesc) =>
+        try Some(loader loadClass pdesc.classname) catch {
+        case _: Exception =>
+          println("Warning: class not found for plugin in %s (%s)".format(jarfile, pdesc.classname))
+          None
+      }
     }
-  }
 
   /** Load all plugins found in the argument list, both in the
    *  jar files explicitly listed, and in the jar files in the