finish collecting all related data for compiling event

y4zhang · y4zhang · commit ab485c723910 · 2017-08-09T17:56:58.000-05:00
diff --git a/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
@@ -1233,7 +1233,6 @@ public OpenDefinitionsDocument newFile(String text) {
     if (dir == null) dir = getMasterWorkingDirectory();
     OpenDefinitionsDocument doc = newFile(dir, text);
     setActiveDocument(doc);
-    //DataCollector.newFile(dir, doc);
     return doc;
   }
   
@@ -1435,8 +1434,7 @@ private OpenDefinitionsDocument[] _openFiles(File[] files)
         _notifier.fileOpened(d);
 	//DataCollector.openClass(d.getParentDirectory(),d)
       }
-    }
-    
+    } 
     return retDocs.toArray(new OpenDefinitionsDocument[0]);
   }
   
@@ -3338,6 +3336,8 @@ public void saveTo(OutputStream os) throws IOException {
         //   We don't save if this happens.
         return false;
       }
+	//DefinitionsDocument ddoc = getDocument();
+	//DataCollector.newFile(_packageName,_parentDir, ddoc);
     }
     
     /** This method tells the document to prepare all the DrJavaBook and PagePrinter objects. */
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java b/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
@@ -65,6 +65,8 @@
 import edu.rice.cs.plt.io.IOUtil;
 import edu.rice.cs.plt.iter.IterUtil;
 import edu.rice.cs.plt.collect.CollectUtil;
+
+//import edu.rice.cs.drjava.collect.*;
 // import edu.rice.cs.plt.tuple.Pair;  
 // TODO: use the preceding pair class instead of javalanglevels.Pair; must change javalanglevels code as well 
 
@@ -273,6 +275,7 @@ private void _doCompile(List<OpenDefinitionsDocument> docs) throws IOException {
       }
       catch (Throwable t) {
         DJError err = new DJError(t.toString(), false);
+	//DataCollector.compiled(filesToCompile, Arrays.asList(err),false,false);
         _distributeErrors(Arrays.asList(err));
         throw new UnexpectedException(t);
       }
@@ -361,11 +364,13 @@ private void _compileFiles(List<File> files, File buildDir) throws IOException {
         synchronized(_compilerLock) {
           if (preprocessedFiles == null) {
             errors.addAll(compiler.compile(files, classPath, null, buildDir, bootClassPath, null, true));
+	//DataCollector.compiled(files, errors,true,true);
           }
           else {
             /** If compiling a language level file, do not show warnings, as these are not caught by the language level 
               * parser */
             errors.addAll(compiler.compile(preprocessedFiles, classPath, null, buildDir, bootClassPath, null, false));
+	//DataCollector.compiled(files, errors,false,true);
           }
         }
       }
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -5148,7 +5148,6 @@ private void _close() {
     // Either this is an external file or user actually wants to close it
     for(OpenDefinitionsDocument doc: l) {
       _model.closeFile(doc);
-      //DataCollector.closeFile(doc);
     }
   }
 
@@ -5322,7 +5321,7 @@ private boolean _rename() {
         /** this highlights the document in the navigator */
         _model.refreshActiveDocument();
 	//File newFile = _model.getActiveDocument().getFile();
-	//DataCollector.RenamedClass(oldFile, newFile);
+	//DataCollector.renamedClass(oldFile, newFile);
         return toReturn;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1233,7 +1233,6 @@ public OpenDefinitionsDocument newFile(String text) {`
`1233`	`1233`	`if (dir == null) dir = getMasterWorkingDirectory();`
`1234`	`1234`	`OpenDefinitionsDocument doc = newFile(dir, text);`
`1235`	`1235`	`setActiveDocument(doc);`
`1236`		`- //DataCollector.newFile(dir, doc);`
`1237`	`1236`	`return doc;`
`1238`	`1237`	`}`
`1239`	`1238`
`@@ -1435,8 +1434,7 @@ private OpenDefinitionsDocument[] _openFiles(File[] files)`
`1435`	`1434`	`_notifier.fileOpened(d);`
`1436`	`1435`	`//DataCollector.openClass(d.getParentDirectory(),d)`
`1437`	`1436`	`}`
`1438`		`- }`
`1439`		`-`
	`1437`	`+ }`
`1440`	`1438`	`return retDocs.toArray(new OpenDefinitionsDocument[0]);`
`1441`	`1439`	`}`
`1442`	`1440`
`@@ -3338,6 +3336,8 @@ public void saveTo(OutputStream os) throws IOException {`
`3338`	`3336`	`// We don't save if this happens.`
`3339`	`3337`	`return false;`
`3340`	`3338`	`}`
	`3339`	`+ //DefinitionsDocument ddoc = getDocument();`
	`3340`	`+ //DataCollector.newFile(_packageName,_parentDir, ddoc);`
`3341`	`3341`	`}`
`3342`	`3342`
`3343`	`3343`	`/** This method tells the document to prepare all the DrJavaBook and PagePrinter objects. */`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@`
`65`	`65`	`import edu.rice.cs.plt.io.IOUtil;`
`66`	`66`	`import edu.rice.cs.plt.iter.IterUtil;`
`67`	`67`	`import edu.rice.cs.plt.collect.CollectUtil;`
	`68`	`+`
	`69`	`+//import edu.rice.cs.drjava.collect.*;`
`68`	`70`	`// import edu.rice.cs.plt.tuple.Pair;`
`69`	`71`	`// TODO: use the preceding pair class instead of javalanglevels.Pair; must change javalanglevels code as well`
`70`	`72`
`@@ -273,6 +275,7 @@ private void _doCompile(List<OpenDefinitionsDocument> docs) throws IOException {`
`273`	`275`	`}`
`274`	`276`	`catch (Throwable t) {`
`275`	`277`	`DJError err = new DJError(t.toString(), false);`
	`278`	`+ //DataCollector.compiled(filesToCompile, Arrays.asList(err),false,false);`
`276`	`279`	`_distributeErrors(Arrays.asList(err));`
`277`	`280`	`throw new UnexpectedException(t);`
`278`	`281`	`}`
`@@ -361,11 +364,13 @@ private void _compileFiles(List<File> files, File buildDir) throws IOException {`
`361`	`364`	`synchronized(_compilerLock) {`
`362`	`365`	`if (preprocessedFiles == null) {`
`363`	`366`	`errors.addAll(compiler.compile(files, classPath, null, buildDir, bootClassPath, null, true));`
	`367`	`+ //DataCollector.compiled(files, errors,true,true);`
`364`	`368`	`}`
`365`	`369`	`else {`
`366`	`370`	`/** If compiling a language level file, do not show warnings, as these are not caught by the language level`
`367`	`371`	`* parser */`
`368`	`372`	`errors.addAll(compiler.compile(preprocessedFiles, classPath, null, buildDir, bootClassPath, null, false));`
	`373`	`+ //DataCollector.compiled(files, errors,false,true);`
`369`	`374`	`}`
`370`	`375`	`}`
`371`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5148,7 +5148,6 @@ private void _close() {`
`5148`	`5148`	`// Either this is an external file or user actually wants to close it`
`5149`	`5149`	`for(OpenDefinitionsDocument doc: l) {`
`5150`	`5150`	`_model.closeFile(doc);`
`5151`		`- //DataCollector.closeFile(doc);`
`5152`	`5151`	`}`
`5153`	`5152`	`}`
`5154`	`5153`
`@@ -5322,7 +5321,7 @@ private boolean _rename() {`
`5322`	`5321`	`/** this highlights the document in the navigator */`
`5323`	`5322`	`_model.refreshActiveDocument();`
`5324`	`5323`	`//File newFile = _model.getActiveDocument().getFile();`
`5325`		`- //DataCollector.RenamedClass(oldFile, newFile);`
	`5324`	`+ //DataCollector.renamedClass(oldFile, newFile);`
`5326`	`5325`	`return toReturn;`
`5327`	`5326`	`}`
`5328`	`5327`	`}`