From 129df3e81250dec7e1d153a981c1f671ec285e09 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Fri, 22 Feb 2013 01:13:09 -0800 Subject: [PATCH] Fix problem with initialization order in `ClassToAPI.scala`. In `ClassToAPI` both `Private` and `Protected` vals had forward reference to `Unqualified` so they would get `null` as a result. Fixed that by rearranging the order of vals being declared. This fixes a problem described in 9dd5f076ea3d3c1cca257a548646c4807e58879a. --- compile/api/src/main/scala/sbt/ClassToAPI.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/api/src/main/scala/sbt/ClassToAPI.scala b/compile/api/src/main/scala/sbt/ClassToAPI.scala index ccb6640b0..19b909df6 100644 --- a/compile/api/src/main/scala/sbt/ClassToAPI.scala +++ b/compile/api/src/main/scala/sbt/ClassToAPI.scala @@ -256,9 +256,9 @@ object ClassToAPI val ThisRef = new api.This val Public = new api.Public + val Unqualified = new api.Unqualified val Private = new api.Private(Unqualified) val Protected = new api.Protected(Unqualified) - val Unqualified = new api.Unqualified def packagePrivate(pkg: Option[String]): api.Access = new api.Private(new api.IdQualifier(pkg getOrElse "")) val ArrayRef = reference("scala.Array")