summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-06-29 20:49:50 +0000
committerPaul Phillips <paulp@improving.org>2011-06-29 20:49:50 +0000
commita2901d5b15ec9615dfd12c64145925019551a531 (patch)
tree23a136117b1ad0690c43c82d55c6c2504d3e8ff9
parent7eaa583930dd8cb5c2b2a8c1eba16ea4470d9e74 (diff)
downloadscala-a2901d5b15ec9615dfd12c64145925019551a531.tar.gz
scala-a2901d5b15ec9615dfd12c64145925019551a531.tar.bz2
scala-a2901d5b15ec9615dfd12c64145925019551a531.zip
again: relax access boundry check for overridin...
again: relax access boundry check for overriding protected java members. review by eugenevigdorchik.
-rw-r--r--test/files/neg/t3946.check5
-rw-r--r--test/files/neg/t3946/J.java4
-rw-r--r--test/files/neg/t3946/S_1.scala4
-rw-r--r--test/files/pos/t3946/Test_1.scala7
4 files changed, 7 insertions, 13 deletions
diff --git a/test/files/neg/t3946.check b/test/files/neg/t3946.check
deleted file mode 100644
index 6379b50dba..0000000000
--- a/test/files/neg/t3946.check
+++ /dev/null
@@ -1,5 +0,0 @@
-S_1.scala:3: error: overriding method m in class J of type ()Unit;
- method m has weaker access privileges; it should be at least protected[p]
- override protected def m { }
- ^
-one error found
diff --git a/test/files/neg/t3946/J.java b/test/files/neg/t3946/J.java
deleted file mode 100644
index 189b8e1d23..0000000000
--- a/test/files/neg/t3946/J.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package p;
-public class J {
- protected void m() { return; }
-}
diff --git a/test/files/neg/t3946/S_1.scala b/test/files/neg/t3946/S_1.scala
deleted file mode 100644
index 2c52094701..0000000000
--- a/test/files/neg/t3946/S_1.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package p
-class S extends J {
- override protected def m { }
-}
diff --git a/test/files/pos/t3946/Test_1.scala b/test/files/pos/t3946/Test_1.scala
index 542b9b160d..0cceff3aab 100644
--- a/test/files/pos/t3946/Test_1.scala
+++ b/test/files/pos/t3946/Test_1.scala
@@ -3,3 +3,10 @@ package q {
override protected def f() { }
}
}
+
+package p {
+ object T {
+ val a = new A()
+ a.f()
+ }
+}