8 files changed, 26 insertions, 19 deletions
diff --git a/sources/scala/tools/scalai/PathClassLoader.java b/sources/scala/tools/scalai/PathClassLoader.java
index a5cbe6a8a4..fb975d4452 100644
--- a/sources/scala/tools/scalai/PathClassLoader.java
+++ b/sources/scala/tools/scalai/PathClassLoader.java
@@ -11,8 +11,9 @@ package scala.tools.scalai;
 
 import java.io.IOException;
 
+import scala.tools.util.AbstractFile;
+
 import scalac.util.ClassPath;
-import scalac.util.AbstractFile;
 
 public class PathClassLoader extends ClassLoader {
 
diff --git a/sources/scalac/util/AbstractFile.java b/sources/scala/tools/util/AbstractFile.java
index 7069df868b..409c695dff 100644
--- a/sources/scalac/util/AbstractFile.java
+++ b/sources/scala/tools/util/AbstractFile.java
@@ -2,11 +2,11 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
-package scalac.util;
+// $Id$
+
+package scala.tools.util;
 
 import java.io.*;
 import java.util.*;
@@ -134,7 +134,7 @@ class PlainFile extends AbstractFile {
     }
 
     public long lastModified() {
-	return f.lastModified();
+        return f.lastModified();
     }
 
     public byte[] read() throws IOException {
@@ -205,7 +205,7 @@ class ZippedFile extends AbstractFile {
     }
 
     public long lastModified() {
-	return zipEntry.getTime();
+        return zipEntry.getTime();
     }
 
     public byte[] read() throws IOException {
@@ -267,7 +267,7 @@ class ZipDir extends AbstractFile {
     }
 
     public long lastModified() {
-	return -1;
+        return -1;
     }
 
     public byte[] read() throws IOException {
@@ -339,7 +339,7 @@ final class JarArchive extends AbstractFile {
     }
 
     public long lastModified() {
-	return -1;
+        return -1;
     }
 
     public byte[] read() throws IOException {
@@ -463,9 +463,9 @@ final class JarArchive extends AbstractFile {
             return true;
         }
 
-	public long lastModified() {
-	    return -1;
-	}
+        public long lastModified() {
+            return -1;
+        }
 
         public String[] list() throws IOException {
             throw new IOException("not a directory");
@@ -534,9 +534,9 @@ final class JarArchive extends AbstractFile {
             return false;
         }
 
-	public long lastModified() {
-	    return -1;
-	}
+        public long lastModified() {
+            return -1;
+        }
 
         public String[] list() throws IOException {
             throw new IOException("not a directory");
@@ -565,9 +565,9 @@ final class JarArchive extends AbstractFile {
             return true;
         }
 
-	public long lastModified() {
-	    return jarFile.getJarEntry(name).getTime();
-	}
+        public long lastModified() {
+            return jarFile.getJarEntry(name).getTime();
+        }
 
         public byte[] read() throws IOException {
             JarEntry jarEntry = jarFile.getJarEntry(name);
diff --git a/sources/scalac/symtab/classfile/ClassParser.java b/sources/scalac/symtab/classfile/ClassParser.java
index 4c40a6016c..e1d782a2a7 100644
--- a/sources/scalac/symtab/classfile/ClassParser.java
+++ b/sources/scalac/symtab/classfile/ClassParser.java
@@ -8,6 +8,7 @@
 
 package scalac.symtab.classfile;
 
+import scala.tools.util.AbstractFile;
 import scalac.*;
 import scalac.symtab.*;
 import scalac.util.*;
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java
index 3181702de5..2ed6430106 100644
--- a/sources/scalac/symtab/classfile/PackageParser.java
+++ b/sources/scalac/symtab/classfile/PackageParser.java
@@ -13,6 +13,7 @@ import java.util.Iterator;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import scala.tools.util.AbstractFile;
 import scala.tools.util.Position;
 
 import scalac.Global;
@@ -21,7 +22,6 @@ import scalac.symtab.SourceCompleter;
 import scalac.symtab.Symbol;
 import scalac.symtab.SymbolLoader;
 import scalac.symtab.Type;
-import scalac.util.AbstractFile;
 import scalac.util.Name;
 import scalac.util.SourceRepresentation;
 
diff --git a/sources/scalac/symtab/classfile/SymblParser.java b/sources/scalac/symtab/classfile/SymblParser.java
index 36abf84df7..fb826d853d 100644
--- a/sources/scalac/symtab/classfile/SymblParser.java
+++ b/sources/scalac/symtab/classfile/SymblParser.java
@@ -8,6 +8,7 @@
 
 package scalac.symtab.classfile;
 
+import scala.tools.util.AbstractFile;
 import scalac.*;
 import scalac.symtab.*;
 import scalac.util.*;
diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java
index db5edbeacc..74a7027424 100644
--- a/sources/scalac/symtab/classfile/UnPickle.java
+++ b/sources/scalac/symtab/classfile/UnPickle.java
@@ -11,6 +11,7 @@ package scalac.symtab.classfile;
 import java.util.HashMap;
 import java.io.IOException;
 import java.io.PrintStream;
+import scala.tools.util.AbstractFile;
 import scala.tools.util.Position;
 import scalac.*;
 import scalac.atree.AConstant;
diff --git a/sources/scalac/util/AbstractFileReader.java b/sources/scalac/util/AbstractFileReader.java
index 3ecd385dc6..bf3d6f437d 100644
--- a/sources/scalac/util/AbstractFileReader.java
+++ b/sources/scalac/util/AbstractFileReader.java
@@ -8,8 +8,9 @@
 
 package scalac.util;
 
-import java.io.*;
+import java.io.IOException;
 
+import scala.tools.util.AbstractFile;
 
 public class AbstractFileReader {
 
diff --git a/sources/scalac/util/ClassPath.java b/sources/scalac/util/ClassPath.java
index bd2a0665e9..6e68be350a 100644
--- a/sources/scalac/util/ClassPath.java
+++ b/sources/scalac/util/ClassPath.java
@@ -11,6 +11,8 @@ package scalac.util;
 import java.io.*;
 import java.util.*;
 
+import scala.tools.util.AbstractFile;
+
 
 public class ClassPath {