From d64a0e078d705a656e1173f2d926d8a7dc19a417 Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Tue, 8 Jan 2013 00:39:40 +0100 Subject: [PATCH] Silence boring Eclipse warnings: catching all exceptions, part 2 These warning fixes are new since my last pull request, please verify. --- ivy/src/main/scala/sbt/IvyActions.scala | 2 +- testing/src/main/scala/sbt/TestFramework.scala | 2 +- util/classfile/src/main/scala/sbt/classfile/Analyze.scala | 2 +- util/collection/src/main/scala/sbt/INode.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ivy/src/main/scala/sbt/IvyActions.scala b/ivy/src/main/scala/sbt/IvyActions.scala index b139d7989..f3ac22c82 100644 --- a/ivy/src/main/scala/sbt/IvyActions.scala +++ b/ivy/src/main/scala/sbt/IvyActions.scala @@ -258,7 +258,7 @@ object IvyActions resolver.publish(artifact, file, overwrite) resolver.commitPublishTransaction() } catch { - case e => + case e: Throwable => try { resolver.abortPublishTransaction() } finally { throw e } } diff --git a/testing/src/main/scala/sbt/TestFramework.scala b/testing/src/main/scala/sbt/TestFramework.scala index 398dab528..07e86e699 100644 --- a/testing/src/main/scala/sbt/TestFramework.scala +++ b/testing/src/main/scala/sbt/TestFramework.scala @@ -83,7 +83,7 @@ final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq } catch { - case e => + case e: Throwable => safeListenersCall(_.endGroup(name, e)) TestResult.Error } diff --git a/util/classfile/src/main/scala/sbt/classfile/Analyze.scala b/util/classfile/src/main/scala/sbt/classfile/Analyze.scala index 72dfed3f5..a85fc886d 100644 --- a/util/classfile/src/main/scala/sbt/classfile/Analyze.scala +++ b/util/classfile/src/main/scala/sbt/classfile/Analyze.scala @@ -21,7 +21,7 @@ private[sbt] object Analyze def load(tpe: String, errMsg: => Option[String]): Option[Class[_]] = try { Some(Class.forName(tpe, false, loader)) } - catch { case e => errMsg.foreach(msg => log.warn(msg + " : " +e.toString)); None } + catch { case e: Throwable => errMsg.foreach(msg => log.warn(msg + " : " +e.toString)); None } val productToSource = new mutable.HashMap[File, File] val sourceToClassFiles = new mutable.HashMap[File, Buffer[ClassFile]] diff --git a/util/collection/src/main/scala/sbt/INode.scala b/util/collection/src/main/scala/sbt/INode.scala index 86ddff060..e9f64ef6c 100644 --- a/util/collection/src/main/scala/sbt/INode.scala +++ b/util/collection/src/main/scala/sbt/INode.scala @@ -70,7 +70,7 @@ abstract class EvaluateSettings[Scope] } private[this] def run0(work: => Unit): Unit = { - try { work } catch { case e => complete.put( Some(e) ) } + try { work } catch { case e: Throwable => complete.put( Some(e) ) } workComplete() }