diff options
author | michelou <michelou@epfl.ch> | 2010-06-29 14:00:36 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2010-06-29 14:00:36 +0000 |
commit | b2abe22c97e0c588f7a5f68e970dbc78f87c6b29 (patch) | |
tree | d075a2e3f720a5d6ef6216239f7d9c4e97c6bac5 /src/partest | |
parent | 1067f5f55ca0de0035fee3d0179203801f0b4b87 (diff) | |
download | scala-b2abe22c97e0c588f7a5f68e970dbc78f87c6b29.tar.gz scala-b2abe22c97e0c588f7a5f68e970dbc78f87c6b29.tar.bz2 scala-b2abe22c97e0c588f7a5f68e970dbc78f87c6b29.zip |
removed warnings (deprecation,unchecked)
Diffstat (limited to 'src/partest')
-rw-r--r-- | src/partest/scala/tools/partest/nest/Diff.java | 8 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/DiffPrint.java | 2 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/partest/scala/tools/partest/nest/Diff.java b/src/partest/scala/tools/partest/nest/Diff.java index f780712b6b..f69fc6858b 100644 --- a/src/partest/scala/tools/partest/nest/Diff.java +++ b/src/partest/scala/tools/partest/nest/Diff.java @@ -49,7 +49,7 @@ public class Diff { an edit script, if desired. */ public Diff(Object[] a,Object[] b) { - Hashtable h = new Hashtable(a.length + b.length); + Hashtable<Object, Integer> h = new Hashtable<Object, Integer>(a.length + b.length); filevec[0] = new file_data(a,h); filevec[1] = new file_data(b,h); } @@ -744,7 +744,7 @@ public class Diff { nondiscarded_lines = j; } - file_data(Object[] data,Hashtable h) { + file_data(Object[] data, Hashtable<Object, Integer> h) { buffered_lines = data.length; equivs = new int[buffered_lines]; @@ -752,9 +752,9 @@ public class Diff { realindexes = new int[buffered_lines]; for (int i = 0; i < data.length; ++i) { - Integer ir = (Integer)h.get(data[i]); + Integer ir = h.get(data[i]); if (ir == null) - h.put(data[i],new Integer(equivs[i] = equiv_max++)); + h.put(data[i], new Integer(equivs[i] = equiv_max++)); else equivs[i] = ir.intValue(); } diff --git a/src/partest/scala/tools/partest/nest/DiffPrint.java b/src/partest/scala/tools/partest/nest/DiffPrint.java index eeb0dd5a09..31f9a1bc79 100644 --- a/src/partest/scala/tools/partest/nest/DiffPrint.java +++ b/src/partest/scala/tools/partest/nest/DiffPrint.java @@ -505,7 +505,7 @@ public class DiffPrint { */ static String[] slurp(String file) throws IOException { BufferedReader rdr = new BufferedReader(new FileReader(file)); - Vector s = new Vector(); + Vector<String> s = new Vector<String>(); for (;;) { String line = rdr.readLine(); if (line == null) break; diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 7797c1095a..931bc5cc13 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -374,7 +374,7 @@ class Worker(val fileManager: FileManager) extends Actor { def isInGroup(f: File, num: Int) = SFile(f).stripExtension endsWith ("_" + num) val groups = (0 to 9).toList map (num => testFiles filter (f => isInGroup(f, num))) - val noGroupSuffix = testFiles -- groups.flatten + val noGroupSuffix = testFiles filterNot (groups.flatten contains) def compileGroup(g: List[File]) { val (scalaFiles, javaFiles) = g partition isScala |