re-committing to make sure that the latest version of AbstractGlobalModel is included, since the junit file generated in the latest build is old

wdforson · wdforson · commit b441caa98f34 · 2012-08-23T22:52:53.000Z
git-svn-id: file:///tmp/test-svn/branches/drscala@5701 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java b/drjava/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
@@ -1306,6 +1306,6 @@ public void nonTestCase(boolean isTestAll, boolean didCompileFail) {
    * some unit tests because the slave JVM keeps its working directory open until it shuts down. 
    */
    public static class TestGlobalModel extends DefaultGlobalModel {
-    public File getWorkingDirectory() { return getMasterWorkingDirectory(); }
+     // public File getWorkingDirectory() { return getMasterWorkingDirectory(); }
   } 
 }
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java b/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
@@ -251,6 +251,9 @@ private void _doCompile(List<OpenDefinitionsDocument> docs) throws IOException {
     /* Filter docs to construct filesToCompile */
     for (OpenDefinitionsDocument doc : docs) {
       if (doc.isSourceFile()) {
+
+        _log.log(doc.getFile() + " IS SourceFile...");
+
         File f = doc.getFile();
         // Check for null in case the file is untitled (not sure this is the correct check)
         if (f != null && f != FileOps.NULL_FILE) {

Original file line number	Diff line number	Diff line change
`@@ -1306,6 +1306,6 @@ public void nonTestCase(boolean isTestAll, boolean didCompileFail) {`
`1306`	`1306`	`* some unit tests because the slave JVM keeps its working directory open until it shuts down.`
`1307`	`1307`	`*/`
`1308`	`1308`	`public static class TestGlobalModel extends DefaultGlobalModel {`
`1309`		`- public File getWorkingDirectory() { return getMasterWorkingDirectory(); }`
	`1309`	`+ // public File getWorkingDirectory() { return getMasterWorkingDirectory(); }`
`1310`	`1310`	`}`
`1311`	`1311`	`}`