Make imports more Scala 2.8-friendly.

In Scala 2.8 there has been a change in which scopes are introduced by
import clauses. This enforced the need of using absolute paths to imported
packages.

This change is backwards-compatible with Scala 2.7.5.

The change to Scala's scope handling is explained here:
http://stackoverflow.com/questions/1243794/what-are-the-biggest-differences-between-scala-2-8-and-scala-2-7/2550270#2550270

This change does not resolve all problems with porting Gimd's code to
Scala 2.8 but it's enough to make the latest version of IntelliJ happy.

Change-Id: Idfa91fe5d30f97c1918eecc3be2ac8fe51d09f92
Signed-off-by: Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com>

18 files changed, 53 insertions, 33 deletions

diff --git a/src/main/scala/com/google/gimd/file/File.scala b/src/main/scala/com/google/gimd/file/File.scala
index 9c92ea2..c10cc20 100644
--- a/src/main/scala/com/google/gimd/file/File.scala
+++ b/src/main/scala/com/google/gimd/file/File.scala
@@ -14,8 +14,8 @@
 
 package com.google.gimd.file
 
-
-import query._
+import com.google.gimd.Message
+import com.google.gimd.query._
 
 /**
  * File is one of the fundamental concepts in Gimd. Basically File is unit of
diff --git a/src/main/scala/com/google/gimd/file/FileType.scala b/src/main/scala/com/google/gimd/file/FileType.scala
index 501fca3..604bebb 100644
--- a/src/main/scala/com/google/gimd/file/FileType.scala
+++ b/src/main/scala/com/google/gimd/file/FileType.scala
@@ -14,6 +14,8 @@
 
 package com.google.gimd.file
 
+import com.google.gimd.{Message, UserType}
+
 /**
  * FileType carries so meta-information about set of Files that conform to
  * all information carried by FileType.
diff --git a/src/main/scala/com/google/gimd/jgit/InvalidJGitBranchNameException.scala b/src/main/scala/com/google/gimd/jgit/InvalidJGitBranchNameException.scala
index 5d5d88c..f3c68f1 100644
--- a/src/main/scala/com/google/gimd/jgit/InvalidJGitBranchNameException.scala
+++ b/src/main/scala/com/google/gimd/jgit/InvalidJGitBranchNameException.scala
@@ -14,6 +14,7 @@
 
 package com.google.gimd.jgit
 
+import com.google.gimd.GimdException
 import org.spearce.jgit.lib.Repository
 
 final class InvalidJGitBranchNameException(val repository: Repository, name: String)
diff --git a/src/main/scala/com/google/gimd/jgit/JGitDatabase.scala b/src/main/scala/com/google/gimd/jgit/JGitDatabase.scala
index bd100ab..f3da9fc 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitDatabase.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitDatabase.scala
@@ -14,10 +14,11 @@
 
 package com.google.gimd.jgit
 
-import file.{FileType, File}
+import com.google.gimd.{Database, Message, Snapshot}
+import com.google.gimd.file.{FileType, File}
+import com.google.gimd.modification.DatabaseModification
+import com.google.gimd.text.Formatter
 import java.io.{IOException, ByteArrayInputStream}
-import text.Formatter
-import modification.DatabaseModification
 import org.spearce.jgit.lib._
 import org.spearce.jgit.merge.MergeStrategy
 import org.spearce.jgit.lib.RefUpdate.Result
diff --git a/src/main/scala/com/google/gimd/jgit/JGitDatabaseException.scala b/src/main/scala/com/google/gimd/jgit/JGitDatabaseException.scala
index 16429a3..57072c5 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitDatabaseException.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitDatabaseException.scala
@@ -14,6 +14,8 @@
 
 package com.google.gimd.jgit
 
+import com.google.gimd.GimdException
+
 case class JGitDatabaseException(val branch: JGitBranch,
                                  val msg: String,
                                  val cause: Throwable) extends GimdException(msg, cause) {
diff --git a/src/main/scala/com/google/gimd/jgit/JGitFile.scala b/src/main/scala/com/google/gimd/jgit/JGitFile.scala
index 4cdf3ca..cd92cf4 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitFile.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitFile.scala
@@ -14,10 +14,10 @@
 
 package com.google.gimd.jgit
 
-import file.{FileType, File}
-import java.io.{InputStreamReader, ByteArrayInputStream}
+import com.google.gimd.file.{FileType, File}
+import com.google.gimd.text.Parser
 import org.spearce.jgit.lib.{ObjectId, Repository}
-import text.Parser
+import java.io.{InputStreamReader, ByteArrayInputStream}
 
 final class JGitFile[T](val path: String, val blobId: ObjectId, val fileType: FileType[T],
                         val branch: JGitBranch) extends File[T] {
diff --git a/src/main/scala/com/google/gimd/jgit/JGitSnapshot.scala b/src/main/scala/com/google/gimd/jgit/JGitSnapshot.scala
index 1f8f553..094577a 100644
--- a/src/main/scala/com/google/gimd/jgit/JGitSnapshot.scala
+++ b/src/main/scala/com/google/gimd/jgit/JGitSnapshot.scala
@@ -14,7 +14,8 @@
 
 package com.google.gimd.jgit
 
-import file.{File, FileType}
+import com.google.gimd.Snapshot
+import com.google.gimd.file.{File, FileType}
 import org.spearce.jgit.lib.{Repository, FileMode}
 import org.spearce.jgit.revwalk.RevCommit
 import org.spearce.jgit.treewalk.filter.{PathFilter, PathSuffixFilter, AndTreeFilter, TreeFilter}
diff --git a/src/main/scala/com/google/gimd/modification/ConflictingModificationException.scala b/src/main/scala/com/google/gimd/modification/ConflictingModificationException.scala
index e75d710..040ca3a 100644
--- a/src/main/scala/com/google/gimd/modification/ConflictingModificationException.scala
+++ b/src/main/scala/com/google/gimd/modification/ConflictingModificationException.scala
@@ -14,6 +14,8 @@
 
 package com.google.gimd.modification
 
+import com.google.gimd.GimdException
+
 /**
  * Exception indicating that two conflicting modifications were supplied to DatabaseModification
  * class.
diff --git a/src/main/scala/com/google/gimd/modification/DatabaseModification.scala b/src/main/scala/com/google/gimd/modification/DatabaseModification.scala
index 3fc1538..0361355 100644
--- a/src/main/scala/com/google/gimd/modification/DatabaseModification.scala
+++ b/src/main/scala/com/google/gimd/modification/DatabaseModification.scala
@@ -14,10 +14,11 @@
 
 package com.google.gimd.modification
 
-import collection.immutable.TreeSet
+import com.google.gimd._
+import com.google.gimd.file.{FileType, File}
+import com.google.gimd.query.{Handle, CompleteHandle, PathHandle}
 import DatabaseModification._
-import file.{FileType, File}
-import query.{Handle, CompleteHandle, PathHandle}
+import collection.immutable.TreeSet
 
 /**
  * <p>Immutable datastructure that represents set of Modifications applied to Gimd database.</p>
diff --git a/src/main/scala/com/google/gimd/query/Handle.scala b/src/main/scala/com/google/gimd/query/Handle.scala
index 4993e68..c7c6861 100644
--- a/src/main/scala/com/google/gimd/query/Handle.scala
+++ b/src/main/scala/com/google/gimd/query/Handle.scala
@@ -14,6 +14,7 @@
 
 package com.google.gimd.query
 
+import com.google.gimd.{MessageField, UserType}
 import com.google.gimd.file.File
 
 /** Any handle to a stored message which corresponds to user object of type T. */
diff --git a/src/main/scala/com/google/gimd/query/Predicate.scala b/src/main/scala/com/google/gimd/query/Predicate.scala
index 171d614..abc65ff 100644
--- a/src/main/scala/com/google/gimd/query/Predicate.scala
+++ b/src/main/scala/com/google/gimd/query/Predicate.scala
@@ -14,6 +14,8 @@
 
 package com.google.gimd.query
 
+import com.google.gimd.ClassUtils
+
 trait Predicate[T] {
   /**
    * Checks if predicate is applicable to given type represented by Class object.
diff --git a/src/test/scala/com/google/gimd/jgit/AbstractJGitTestCase.scala b/src/test/scala/com/google/gimd/jgit/AbstractJGitTestCase.scala
index 33de36f..da5019c 100644
--- a/src/test/scala/com/google/gimd/jgit/AbstractJGitTestCase.scala
+++ b/src/test/scala/com/google/gimd/jgit/AbstractJGitTestCase.scala
@@ -14,9 +14,10 @@
 
 package com.google.gimd.jgit
 
-import java.io.{ByteArrayInputStream, IOException, File}
-import org.junit.{After, Before}
+import com.google.gimd.UserType
 import org.spearce.jgit.lib._
+import org.junit.{After, Before}
+import java.io.{ByteArrayInputStream, IOException, File}
 
 abstract class AbstractJGitTestCase {
 
diff --git a/src/test/scala/com/google/gimd/jgit/JGitDatabaseTestCase.scala b/src/test/scala/com/google/gimd/jgit/JGitDatabaseTestCase.scala
index d82e378..36f5eab 100644
--- a/src/test/scala/com/google/gimd/jgit/JGitDatabaseTestCase.scala
+++ b/src/test/scala/com/google/gimd/jgit/JGitDatabaseTestCase.scala
@@ -14,13 +14,14 @@
 
 package com.google.gimd.jgit
 
-import file.{File, FileType}
-import modification.DatabaseModification
+import com.google.gimd._
+import com.google.gimd.UserType._
+import com.google.gimd.file.{File, FileType}
+import com.google.gimd.modification.DatabaseModification
+import com.google.gimd.query.Predicate
+import org.spearce.jgit.lib.{Constants, ObjectId}
 import org.junit.Test
 import org.junit.Assert._
-import org.spearce.jgit.lib.{Constants, ObjectId}
-import query.Predicate
-import UserType._
 
 final class JGitDatabaseTestCase extends AbstractJGitTestCase {
 
@@ -101,7 +102,7 @@ final class JGitDatabaseTestCase extends AbstractJGitTestCase {
 
   @Test
   def modifySimpleMessagesWithoutMovingFiles {
-    import query.Predicate.functionLiteral2Predicate
+    import com.google.gimd.query.Predicate.functionLiteral2Predicate
 
     val first = SimpleMessage("first", 1)
     val second = SimpleMessage("second", 2)
@@ -130,7 +131,7 @@ final class JGitDatabaseTestCase extends AbstractJGitTestCase {
 
   @Test
   def modifySimpleMessagesWithMovingFiles {
-    import query.Predicate.functionLiteral2Predicate
+    import com.google.gimd.query.Predicate.functionLiteral2Predicate
 
     val first = SimpleMessage("first", 1)
     val second = SimpleMessage("second", 2)
@@ -162,7 +163,7 @@ final class JGitDatabaseTestCase extends AbstractJGitTestCase {
 
   @Test
   def deleteSimpleMessage {
-    import query.Predicate.functionLiteral2Predicate
+    import com.google.gimd.query.Predicate.functionLiteral2Predicate
 
     val first = SimpleMessage("first", 1)
     val second = SimpleMessage("second", 2)
diff --git a/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala b/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala
index 9797b00..13303ff 100644
--- a/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala
+++ b/src/test/scala/com/google/gimd/jgit/JGitFileTestCase.scala
@@ -14,11 +14,12 @@
 
 package com.google.gimd.jgit
 
-import file.FileType
-import junit.framework.Assert._
-import org.junit.Test
+import com.google.gimd._
+import com.google.gimd.UserType._
+import com.google.gimd.file.FileType
 import org.spearce.jgit.lib.ObjectId
-import UserType._
+import org.junit.Test
+import junit.framework.Assert._
 
 class JGitFileTestCase extends AbstractJGitTestCase {
 
diff --git a/src/test/scala/com/google/gimd/modification/ModificationTestCase.scala b/src/test/scala/com/google/gimd/modification/ModificationTestCase.scala
index 2f9e09c..bfe28e9 100644
--- a/src/test/scala/com/google/gimd/modification/ModificationTestCase.scala
+++ b/src/test/scala/com/google/gimd/modification/ModificationTestCase.scala
@@ -15,11 +15,12 @@
 package com.google.gimd.modification
 
 
-import file.{FileType, File}
+import com.google.gimd._
+import com.google.gimd.UserType._
+import com.google.gimd.file.{FileType, File}
+import com.google.gimd.query._
 import org.junit.Test
 import org.junit.Assert._
-import query._
-import UserType._
 
 final class ModificationTestCase {
 
diff --git a/src/test/scala/com/google/gimd/query/MessageQueryTestCase.scala b/src/test/scala/com/google/gimd/query/MessageQueryTestCase.scala
index c8c58eb..a090717 100644
--- a/src/test/scala/com/google/gimd/query/MessageQueryTestCase.scala
+++ b/src/test/scala/com/google/gimd/query/MessageQueryTestCase.scala
@@ -14,10 +14,11 @@
 
 package com.google.gimd.query
 
-import file.{File, FileType}
+import com.google.gimd._
+import com.google.gimd.UserType._
+import com.google.gimd.file.{File, FileType}
 import org.junit.Test
 import org.junit.Assert._
-import UserType._
 
 class MessageQueryTestCase {
   case class TreeNode(id: Int, name: String)
diff --git a/src/test/scala/com/google/gimd/text/FormatterTestCase.scala b/src/test/scala/com/google/gimd/text/FormatterTestCase.scala
index f06bc13..70676d3 100644
--- a/src/test/scala/com/google/gimd/text/FormatterTestCase.scala
+++ b/src/test/scala/com/google/gimd/text/FormatterTestCase.scala
@@ -14,9 +14,10 @@
 
 package com.google.gimd.text
 
+import com.google.gimd.{Field, Message}
+import Formatter._
 import org.junit.Test
 import org.junit.Assert.assertEquals
-import Formatter._
 
 final class FormatterTestCase {
 
diff --git a/src/test/scala/com/google/gimd/text/ParserTestCase.scala b/src/test/scala/com/google/gimd/text/ParserTestCase.scala
index b1566ae..18b220d 100644
--- a/src/test/scala/com/google/gimd/text/ParserTestCase.scala
+++ b/src/test/scala/com/google/gimd/text/ParserTestCase.scala
@@ -14,9 +14,10 @@
 
 package com.google.gimd.text
 
+import com.google.gimd.{Field, Message}
+import Parser._
 import org.junit.Test
 import org.junit.Assert._
-import Parser._
 
 final class ParserTestCase {