diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-12-07 16:33:00 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-12-07 16:33:00 +0000 |
commit | 32454d61e7a310b2d2c415650adb107571f1210b (patch) | |
tree | c95d5e8e5c3c968bfc52172159c70f0120eb344d /src | |
parent | 2087a249ac07195e3c78417f2dfca6587e461f99 (diff) | |
download | scala-32454d61e7a310b2d2c415650adb107571f1210b.tar.gz scala-32454d61e7a310b2d2c415650adb107571f1210b.tar.bz2 scala-32454d61e7a310b2d2c415650adb107571f1210b.zip |
Reverts previous commit: needs a new starr..
This reverts commit 99652fe553a1a5b0c551950e8178e867943a088f.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/ant/Scaladoc.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 7 | ||||
-rw-r--r-- | src/swing/scala/swing/RichWindow.scala | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/ant/Scaladoc.scala b/src/compiler/scala/tools/ant/Scaladoc.scala index 720aa105d1..be5311b471 100644 --- a/src/compiler/scala/tools/ant/Scaladoc.scala +++ b/src/compiler/scala/tools/ant/Scaladoc.scala @@ -384,7 +384,7 @@ class Scaladoc extends ScalaMatchingTask { /** This is forwarding method to circumvent bug #281 in Scala 2. Remove when * bug has been corrected. */ - override protected def getDirectoryScanner(baseDir: java.io.File) = + override def getDirectoryScanner(baseDir: java.io.File) = super.getDirectoryScanner(baseDir) /** Transforms a string name into a file relative to the provided base diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 67664b7262..5c8e474d58 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -329,10 +329,9 @@ abstract class RefChecks extends InfoTransform { // todo: align accessibility implication checking with isAccessible in Contexts val ob = other.accessBoundary(member.owner) val mb = member.accessBoundary(member.owner) - def isOverrideAccessOK = member.isPublic || { // member is public, definitely same or relaxed access - (!other.isProtected || member.isProtected) && // if o is protected, so is m - ((!isRootOrNone(ob) && ob.hasTransOwner(mb)) || // m relaxes o's access boundary - other.isJavaDefined) // overriding a protected java member, see #3946 + def isOverrideAccessOK = member.isPublic || { // member is public, definitely same or relaxed access + (!other.isProtected || member.isProtected) && // if o is protected, so is m + (!isRootOrNone(ob) && ob.hasTransOwner(mb)) // m relaxes o's access boundary } if (!isOverrideAccessOK) { overrideAccessError() diff --git a/src/swing/scala/swing/RichWindow.scala b/src/swing/scala/swing/RichWindow.scala index 10e396247e..dcad382a33 100644 --- a/src/swing/scala/swing/RichWindow.scala +++ b/src/swing/scala/swing/RichWindow.scala @@ -78,7 +78,7 @@ class Frame extends RichWindow { override lazy val peer: JFrame with InterfaceMixin = new JFrame with InterfaceMixin with SuperMixin protected trait SuperMixin extends JFrame { - override protected def processWindowEvent(e: java.awt.event.WindowEvent) { + override def processWindowEvent(e: java.awt.event.WindowEvent) { super.processWindowEvent(e) if (e.getID() == java.awt.event.WindowEvent.WINDOW_CLOSING) closeOperation() |