From 25b1b24c08f23f94eb817357cb5fe02e05d706a1 Mon Sep 17 00:00:00 2001 From: mihaylov Date: Sat, 11 Nov 2006 07:54:39 +0000 Subject: Removed java.io._ imports from the test suite --- test/files/neg/bug521.check | 8 ++++---- test/files/neg/bug521.scala | 20 ++++++-------------- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'test/files/neg') diff --git a/test/files/neg/bug521.check b/test/files/neg/bug521.check index fa2ddffbaf..e7b149dca4 100644 --- a/test/files/neg/bug521.check +++ b/test/files/neg/bug521.check @@ -1,14 +1,14 @@ -bug521.scala:12 error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => java.lang.String is not defined +bug521.scala:10 error: class PlainFile needs to be abstract, since method path in class AbstractFile of type => java.lang.String is not defined class PlainFile(val file : File) extends AbstractFile {} ^ -bug521.scala:21 error: error overriding value file in class PlainFile of type java.io.File; +bug521.scala:13 error: error overriding value file in class PlainFile of type java.io.File; value file needs `override' modifier final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { ^ -bug521.scala:21 error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => java.lang.String is not defined +bug521.scala:13 error: class ZipArchive needs to be abstract, since method path in class AbstractFile of type => java.lang.String is not defined final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { ^ -bug521.scala:23 error: error overriding value path in class VirtualFile of type java.lang.String; +bug521.scala:15 error: error overriding value path in class VirtualFile of type java.lang.String; method path needs to be an immutable value override def path = ""; ^ diff --git a/test/files/neg/bug521.scala b/test/files/neg/bug521.scala index 065f65557c..c6afebc0be 100644 --- a/test/files/neg/bug521.scala +++ b/test/files/neg/bug521.scala @@ -1,23 +1,15 @@ +package test + +import java.io.File +import java.util.zip.ZipFile -// AbstractFile.scala -package test; -import java.io._; abstract class AbstractFile { def path : String; } -// PlainFile.scala -//package scala.tools.nsc.io; -//import java.io._; class PlainFile(val file : File) extends AbstractFile {} -// VirtualFile.scala -//package scala.tools.nsc.io; -class VirtualFile(val name : String, val path : String) extends AbstractFile { -} -// ZipArchive.scala -//package scala.tools.nsc.io; -//import java.io._; -import java.util.zip._; +class VirtualFile(val name : String, val path : String) extends AbstractFile {} + final class ZipArchive(val file : File, archive : ZipFile) extends PlainFile(file) { class Entry(name : String, path : String) extends VirtualFile(name, path) { override def path = ""; -- cgit v1.2.3