summaryrefslogtreecommitdiff
path: root/test/files/jvm5
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/jvm5')
-rw-r--r--test/files/jvm5/annotations.check13
-rw-r--r--test/files/jvm5/annotations.scala3
2 files changed, 15 insertions, 1 deletions
diff --git a/test/files/jvm5/annotations.check b/test/files/jvm5/annotations.check
index f01f31d1d9..de725e2513 100644
--- a/test/files/jvm5/annotations.check
+++ b/test/files/jvm5/annotations.check
@@ -1,3 +1,16 @@
+/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:131: warning: type Integer in object Predef is deprecated
+ private var count: Integer = 0
+ ^
+/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:136: warning: type Integer in object Predef is deprecated
+ getClass().getMethod("setCount", Array[java.lang.Class](classOf[Integer]))
+ ^
+/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:138: warning: type Integer in object Predef is deprecated
+ def get = getter.invoke(this, Array()).asInstanceOf[Integer].intValue
+ ^
+/Users/adriaan/src/scala/trunk/test/files/jvm5/annotations.scala:139: warning: type Integer in object Predef is deprecated
+ def set(n: Int) = setter.invoke(this, Array(new Integer(n)))
+ ^
+four warnings found
class java.rmi.RemoteException
class java.io.IOException
@java.lang.Deprecated()
diff --git a/test/files/jvm5/annotations.scala b/test/files/jvm5/annotations.scala
index addf2bb07f..4a516a16c4 100644
--- a/test/files/jvm5/annotations.scala
+++ b/test/files/jvm5/annotations.scala
@@ -125,7 +125,8 @@ object Test4 {
object Test5 {
import scala.reflect.BeanProperty
- import java.lang.Integer
+// no need to import java.lang.Integer, Predef.Integer is simply an alias for it
+// classOf[Integer] now properly resolves to classOf[java.lang.Integer]
class Count {
// we use "Integer" instead of "Int" because of Java reflection
@BeanProperty