From 9401d47e797ac3ca85ec3fd20037521338b65331 Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Sun, 20 Sep 2015 08:42:10 -0700 Subject: [PATCH] Remove copyright from IOSpecification, and use a simpler Resource lookup. --- util/io/src/main/scala/sbt/IO.scala | 7 +++---- util/io/src/test/scala/sbt/IOSpecification.scala | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/util/io/src/main/scala/sbt/IO.scala b/util/io/src/main/scala/sbt/IO.scala index 407cde6ce..50c6c6c65 100644 --- a/util/io/src/main/scala/sbt/IO.scala +++ b/util/io/src/main/scala/sbt/IO.scala @@ -44,10 +44,9 @@ object IO { if (codeSource ne null) { codeSource.getLocation } else { - // NB: this assumes that System-class-loaded classes are located in jars, and thus relies on - // uses forward-slash-separated paths and `urlAsFile`'s truncation to the containing jar file - val clsfile = s"${cl.getName.replace('.', '/')}.class" - Option(ClassLoader.getSystemClassLoader.getResource(clsfile)) + // NB: This assumes that classes without code sources are System classes, and thus located in + // jars. It assumes that `urlAsFile` will truncate to the containing jar file. + Option(cl.getResource(cl.getSimpleName + ".class")) .flatMap { urlAsFile }.getOrElse { diff --git a/util/io/src/test/scala/sbt/IOSpecification.scala b/util/io/src/test/scala/sbt/IOSpecification.scala index ccffdc5c2..882f147c5 100644 --- a/util/io/src/test/scala/sbt/IOSpecification.scala +++ b/util/io/src/test/scala/sbt/IOSpecification.scala @@ -1,6 +1,3 @@ -/* sbt -- Simple Build Tool - * Copyright 2008 Mark Harrah */ - package sbt import util.Try