From 9dec02ee51104b207689813caf163fcecaab854b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 26 Apr 2011 21:19:56 -0400
Subject: [PATCH] fix analysis of Java sources being overwritten

---
 compile/api/ClassToAPI.scala     | 4 +---
 compile/interface/API.scala      | 3 ++-
 compile/interface/Analyzer.scala | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compile/api/ClassToAPI.scala b/compile/api/ClassToAPI.scala
index 8f2d68ec7..57dadfe77 100644
--- a/compile/api/ClassToAPI.scala
+++ b/compile/api/ClassToAPI.scala
@@ -166,7 +166,7 @@ object ClassToAPI
 		pkg match
 		{
 			// translate all primitives?
-			case None => new api.Projection(EmptyPrefix, cls)
+			case None => new api.Projection(Empty, cls)
 			case Some(p) =>
 				new api.Projection(new api.Singleton(pathFromString(p)), cls)
 		}
@@ -202,8 +202,6 @@ object ClassToAPI
 	}
 
 	val Empty = new api.EmptyType
-	val EmptyPath = new api.Path(Array())
-	val EmptyPrefix = new api.Singleton(EmptyPath)
 	val ThisRef = new api.This
 
 	val Public = new api.Public
diff --git a/compile/interface/API.scala b/compile/interface/API.scala
index cee5c751d..1a8644f7f 100644
--- a/compile/interface/API.scala
+++ b/compile/interface/API.scala
@@ -37,7 +37,8 @@ final class API(val global: Global, val callback: xsbti.AnalysisCallback) extend
 			val stop = System.currentTimeMillis
 			println("API phase took : " + ((stop - start)/1000.0) + " s")
 		}
-		def processUnit(unit: CompilationUnit)
+		def processUnit(unit: CompilationUnit) = if(!unit.isJava) processScalaUnit(unit)
+		def processScalaUnit(unit: CompilationUnit)
 		{
 			val sourceFile = unit.source.file.file
 			println("Traversing " + sourceFile)
diff --git a/compile/interface/Analyzer.scala b/compile/interface/Analyzer.scala
index 2973aa268..bf6143ab0 100644
--- a/compile/interface/Analyzer.scala
+++ b/compile/interface/Analyzer.scala
@@ -30,7 +30,7 @@ final class Analyzer(val global: Global, val callback: AnalysisCallback) extends
 		{
 			val outputDirectory = new File(global.settings.outdir.value)
 
-			for(unit <- currentRun.units)
+			for(unit <- currentRun.units if !unit.isJava)
 			{
 				// build dependencies structure
 				val sourceFile = unit.source.file.file