summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-03 09:54:02 -0800
committerPaul Phillips <paulp@improving.org>2012-02-03 12:47:12 -0800
commitc5871a974aeaed8d90794c44629bde61f516dfaa (patch)
tree329bdbaa60aa69d12cdaf5654705ae845027d6e4 /src/library
parent7ec4ba5ea921eafb092b05f580ba7381edcd8427 (diff)
downloadscala-c5871a974aeaed8d90794c44629bde61f516dfaa.tar.gz
scala-c5871a974aeaed8d90794c44629bde61f516dfaa.tar.bz2
scala-c5871a974aeaed8d90794c44629bde61f516dfaa.zip
Mostly eliminated ScalaObject.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/ScalaObject.scala13
-rw-r--r--src/library/scala/util/Properties.scala2
2 files changed, 1 insertions, 14 deletions
diff --git a/src/library/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala
deleted file mode 100644
index 8da0ab2cba..0000000000
--- a/src/library/scala/ScalaObject.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-
-
-package scala
-
-trait ScalaObject extends java.lang.Object
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
index 22de5544a8..df1c68ced4 100644
--- a/src/library/scala/util/Properties.scala
+++ b/src/library/scala/util/Properties.scala
@@ -15,7 +15,7 @@ import java.util.jar.Attributes.{ Name => AttributeName }
/** Loads `library.properties` from the jar. */
object Properties extends PropertiesTrait {
protected def propCategory = "library"
- protected def pickJarBasedOn = classOf[ScalaObject]
+ protected def pickJarBasedOn = classOf[Option[_]]
/** Scala manifest attributes.
*/