Reverts previous commit: needs a new starr..

This reverts commit 99652fe553a1a5b0c551950e8178e867943a088f.

5 files changed, 5 insertions, 16 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()
diff --git a/test/files/pos/t3946/A.java b/test/files/pos/t3946/A.java
deleted file mode 100644
index 70265229df..0000000000
--- a/test/files/pos/t3946/A.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package p;
-
-public class A {
-    protected void f() {}
-}
diff --git a/test/files/pos/t3946/Test_1.scala b/test/files/pos/t3946/Test_1.scala
deleted file mode 100644
index 542b9b160d..0000000000
--- a/test/files/pos/t3946/Test_1.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package q {
-  class B extends p.A {
-    override protected def f() { }
-  }
-}