diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-03-18 12:57:12 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-03-18 12:57:12 +0000 |
commit | 2922407bf3d36b6e4a3e972d355f351d7d3c073b (patch) | |
tree | 00c8c6f409f238bd11b505a42c9a51b3e5f3e956 /test/files/pos | |
parent | 067030c369cdfbf2ebd6761eb4a5a6755b346a32 (diff) | |
download | scala-2922407bf3d36b6e4a3e972d355f351d7d3c073b.tar.gz scala-2922407bf3d36b6e4a3e972d355f351d7d3c073b.tar.bz2 scala-2922407bf3d36b6e4a3e972d355f351d7d3c073b.zip |
Merged revisions 24483-24486 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r24483 | extempore | 2011-03-17 21:04:47 +0100 (Thu, 17 Mar 2011) | 5 lines
Always forget that checking system properties causes exceptions in
applets and such. Made the system property wrapper wrap its access
checks in some more wrapping. I spent a long time trying to write a
test for the security manager but it's hopeless without knowing all
the details of the test environment. Closes #4346, no review. ........
r24484 | extempore | 2011-03-17 23:40:54 +0100 (Thu, 17 Mar 2011) | 1
line
Reenabled the commented out bits of the test for #1642. No review.
........ r24485 | extempore | 2011-03-18 02:00:04 +0100 (Fri, 18 Mar
2011) | 1 line
Disabled test not actually doing anything anyway, no review. ........
r24486 | rytz | 2011-03-18 10:44:07 +0100 (Fri, 18 Mar 2011) | 1 line
close #4041. review by extempore
........
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/t1642/JavaCallingScalaHashMap.java | 6 | ||||
-rw-r--r-- | test/files/pos/t1642b.scala (renamed from test/files/pos/t1642/test.scala) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/pos/t1642/JavaCallingScalaHashMap.java b/test/files/pos/t1642/JavaCallingScalaHashMap.java index bde3bd39c4..976e465ff7 100644 --- a/test/files/pos/t1642/JavaCallingScalaHashMap.java +++ b/test/files/pos/t1642/JavaCallingScalaHashMap.java @@ -1,8 +1,8 @@ -// import scala.collection.immutable.HashMap; -// import scala.collection.immutable.Map; +import scala.collection.immutable.HashMap; +import scala.collection.immutable.Map; public class JavaCallingScalaHashMap { public static void main( String[] args ) { - // Map<String, Integer> hashMap = new HashMap<String, Integer>(); + Map<String, Integer> hashMap = new HashMap<String, Integer>(); } } diff --git a/test/files/pos/t1642/test.scala b/test/files/pos/t1642b.scala index 72e53b0c9a..72e53b0c9a 100644 --- a/test/files/pos/t1642/test.scala +++ b/test/files/pos/t1642b.scala |