From 18cfaa7414c6e338d991001744fac69bfaa87d2b Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 12 Apr 2011 20:28:30 -0400 Subject: [PATCH] finals --- launch/BootConfiguration.scala | 10 +++++----- util/io/NameFilter.scala | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/launch/BootConfiguration.scala b/launch/BootConfiguration.scala index 4d56f7308..de9b2a460 100644 --- a/launch/BootConfiguration.scala +++ b/launch/BootConfiguration.scala @@ -29,16 +29,16 @@ private object BootConfiguration /** The Ivy pattern used for the local Ivy repository.*/ def LocalIvyPattern = LocalPattern - val FjbgPackage = "ch.epfl.lamp.fjbg." + final val FjbgPackage = "ch.epfl.lamp.fjbg." /** The class name prefix used to hide the Scala classes used by this loader from the application */ - val ScalaPackage = "scala." + final val ScalaPackage = "scala." /** The class name prefix used to hide the Ivy classes used by this loader from the application*/ - val IvyPackage = "org.apache.ivy." + final val IvyPackage = "org.apache.ivy." /** The class name prefix used to hide the launcher classes from the application. * Note that access to xsbti classes are allowed.*/ - val SbtBootPackage = "xsbt.boot." + final val SbtBootPackage = "xsbt.boot." /** The prefix for JLine resources.*/ - val JLinePackagePath = "jline/" + final val JLinePackagePath = "jline/" /** The loader will check that these classes can be loaded and will assume that their presence indicates * the Scala compiler and library have been downloaded.*/ val TestLoadScalaClasses = "scala.Option" :: "scala.tools.nsc.Global" :: Nil diff --git a/util/io/NameFilter.scala b/util/io/NameFilter.scala index c60d57dc9..7ea8dff98 100644 --- a/util/io/NameFilter.scala +++ b/util/io/NameFilter.scala @@ -31,19 +31,19 @@ object ExistsFileFilter extends FileFilter { object DirectoryFilter extends FileFilter { def accept(file: File) = file.isDirectory } -class SimpleFileFilter(val acceptFunction: File => Boolean) extends FileFilter +final class SimpleFileFilter(val acceptFunction: File => Boolean) extends FileFilter { def accept(file: File) = acceptFunction(file) } -class ExactFilter(val matchName: String) extends NameFilter +final class ExactFilter(val matchName: String) extends NameFilter { def accept(name: String) = matchName == name } -class SimpleFilter(val acceptFunction: String => Boolean) extends NameFilter +final class SimpleFilter(val acceptFunction: String => Boolean) extends NameFilter { def accept(name: String) = acceptFunction(name) } -class PatternFilter(val pattern: Pattern) extends NameFilter +final class PatternFilter(val pattern: Pattern) extends NameFilter { def accept(name: String) = pattern.matcher(name).matches }