summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2009-09-24 13:09:40 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2009-09-24 13:09:40 +0000
commitc1f5cbd4a070ccef03e81071041f9cfa6e49e85e (patch)
tree9a1da088713800634a70a9fe9293a04ef2a9ef49 /test/files/jvm
parent593d685e4fa50cf087bfc89a208ed2c89d2407c1 (diff)
downloadscala-c1f5cbd4a070ccef03e81071041f9cfa6e49e85e.tar.gz
scala-c1f5cbd4a070ccef03e81071041f9cfa6e49e85e.tar.bz2
scala-c1f5cbd4a070ccef03e81071041f9cfa6e49e85e.zip
[no content change] Fixed all SVN properties: m...
[no content change] Fixed all SVN properties: mimes, EOL, executable. Id expansion is consistently enabled for Scala/Java/C# sources in 'src/' and consistently disabled and removed from everywhere else: there should not be any dead Id tags anymore.
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/JavaInteraction.scala1
-rw-r--r--test/files/jvm/bigints.scala1
-rw-r--r--test/files/jvm/inner.scala1
-rwxr-xr-xtest/files/jvm/mkAnnotationsJar.sh1
-rw-r--r--test/files/jvm/nest.scala1
-rw-r--r--test/files/jvm/protectedacc.scala1
-rw-r--r--test/files/jvm/stringbuilder.scala2
-rw-r--r--[-rwxr-xr-x]test/files/jvm/t1652.check0
-rw-r--r--test/files/jvm/ticket2163/ticket2163.java2
-rw-r--r--test/files/jvm/ticket2163/ticket2163.scala2
-rw-r--r--[-rwxr-xr-x]test/files/jvm/typerep.check0
-rw-r--r--[-rwxr-xr-x]test/files/jvm/typerep.scala1
12 files changed, 2 insertions, 11 deletions
diff --git a/test/files/jvm/JavaInteraction.scala b/test/files/jvm/JavaInteraction.scala
index 2728a5aee4..1316fad5d4 100644
--- a/test/files/jvm/JavaInteraction.scala
+++ b/test/files/jvm/JavaInteraction.scala
@@ -1,7 +1,6 @@
//############################################################################
// Test Java interaction
//############################################################################
-// $Id$
import java.awt.Color;
import java.awt.Point;
diff --git a/test/files/jvm/bigints.scala b/test/files/jvm/bigints.scala
index 4fae613ad5..0342c3007e 100644
--- a/test/files/jvm/bigints.scala
+++ b/test/files/jvm/bigints.scala
@@ -1,7 +1,6 @@
//############################################################################
// BigInt, BigDecimal
//############################################################################
-// $Id$
//############################################################################
diff --git a/test/files/jvm/inner.scala b/test/files/jvm/inner.scala
index 4ad1f1e215..ce4de718e6 100644
--- a/test/files/jvm/inner.scala
+++ b/test/files/jvm/inner.scala
@@ -1,7 +1,6 @@
//############################################################################
// Test Java interaction with scala inner classes
//############################################################################
-// $Id$
import java.io.{BufferedReader, File, FileWriter, InputStreamReader}
diff --git a/test/files/jvm/mkAnnotationsJar.sh b/test/files/jvm/mkAnnotationsJar.sh
index 0cd5e631a7..3d69351165 100755
--- a/test/files/jvm/mkAnnotationsJar.sh
+++ b/test/files/jvm/mkAnnotationsJar.sh
@@ -2,7 +2,6 @@
##############################################################################
# Author : Nikolay Mihaylov
-# Revision: $Id$
##############################################################################
##############################################################################
diff --git a/test/files/jvm/nest.scala b/test/files/jvm/nest.scala
index 60f3a3155f..3ab62484fa 100644
--- a/test/files/jvm/nest.scala
+++ b/test/files/jvm/nest.scala
@@ -1,7 +1,6 @@
//############################################################################
// Test Scala interaction with Java nested classes and static members.
//############################################################################
-// $Id: inner.scala 8902 2006-10-10 10:58:10 +0200 (Tue, 10 Oct 2006) mihaylov $
/** found in nest.jar, compiled from nest.java */
import nestpkg._;
diff --git a/test/files/jvm/protectedacc.scala b/test/files/jvm/protectedacc.scala
index f5d05e21b4..c3b07a0a7e 100644
--- a/test/files/jvm/protectedacc.scala
+++ b/test/files/jvm/protectedacc.scala
@@ -1,7 +1,6 @@
//############################################################################
// Test Java interaction with scala inner classes
//############################################################################
-// $Id: $
import java.io.{BufferedReader, File, FileWriter, InputStreamReader}
diff --git a/test/files/jvm/stringbuilder.scala b/test/files/jvm/stringbuilder.scala
index cbbfa022b0..bacd13c715 100644
--- a/test/files/jvm/stringbuilder.scala
+++ b/test/files/jvm/stringbuilder.scala
@@ -1,5 +1,3 @@
-/* $Id$ */
-
import testing.SUnit._
/** Test the Scala implementation of class <code>scala.StringBuilder</code>.
diff --git a/test/files/jvm/t1652.check b/test/files/jvm/t1652.check
index dfa480ce6e..dfa480ce6e 100755..100644
--- a/test/files/jvm/t1652.check
+++ b/test/files/jvm/t1652.check
diff --git a/test/files/jvm/ticket2163/ticket2163.java b/test/files/jvm/ticket2163/ticket2163.java
index f8f26f0140..b6511d241c 100644
--- a/test/files/jvm/ticket2163/ticket2163.java
+++ b/test/files/jvm/ticket2163/ticket2163.java
@@ -6,4 +6,4 @@ public class ticket2163 {
Ticket2163Scala<List> foo = new Ticket2163Scala<List>(array);
foo.bar(array);
}
-} \ No newline at end of file
+}
diff --git a/test/files/jvm/ticket2163/ticket2163.scala b/test/files/jvm/ticket2163/ticket2163.scala
index b6c51f41fb..d30bfe251b 100644
--- a/test/files/jvm/ticket2163/ticket2163.scala
+++ b/test/files/jvm/ticket2163/ticket2163.scala
@@ -2,4 +2,4 @@ class Ticket2163Scala[CC[X]](x: CC[Int]) {
def bar[DD[X]](meh: DD[Int]): CC[Int] = x
}
-object Test extends Application {} \ No newline at end of file
+object Test extends Application {}
diff --git a/test/files/jvm/typerep.check b/test/files/jvm/typerep.check
index ca93180946..ca93180946 100755..100644
--- a/test/files/jvm/typerep.check
+++ b/test/files/jvm/typerep.check
diff --git a/test/files/jvm/typerep.scala b/test/files/jvm/typerep.scala
index fc94817adf..51a848240a 100755..100644
--- a/test/files/jvm/typerep.scala
+++ b/test/files/jvm/typerep.scala
@@ -1,7 +1,6 @@
//############################################################################
// Type Representation at runtime
//############################################################################
-// $Id: $
import TypeRep._