rename/close/closeAll but save

y4zhang · y4zhang · commit 07649676babb · 2017-07-26T17:30:43.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
@@ -1433,7 +1433,7 @@ private OpenDefinitionsDocument[] _openFiles(File[] files)
       for(OpenDefinitionsDocument d : alreadyOpenDocuments) {
         _notifier.handleAlreadyOpenDocument(d);
         _notifier.fileOpened(d);
-	//DataCollector.openClass(d)
+	//DataCollector.openClass(d.getParentDirectory(),d)
       }
     }
     
@@ -2092,7 +2092,8 @@ public boolean closeFiles(List<OpenDefinitionsDocument> docs) {
     _ensureNotActive(docs);
     
     // Close the files in docs.
-    for (OpenDefinitionsDocument doc : docs) { closeFileWithoutPrompt(doc); }  
+    for (OpenDefinitionsDocument doc : docs) { closeFileWithoutPrompt(doc); } 
+    //for (OpenDefinitionsDocument doc : docs) { DataCollector.closeFile(doc);} 
     return true;
   }
   
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -5148,6 +5148,7 @@ 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);
     }
   }
 
@@ -5315,9 +5316,13 @@ private boolean _rename() {
         boolean toReturn = _model.getActiveDocument().saveFileAs(_saveAsSelector);
         /** Delete the old file if save was successful. */
         // TODO: what if delete() fails? (mgricken)
+
+	//File oldFile = fileToDelete;
         if (toReturn && ! _model.getActiveDocument().getFile().equals(fileToDelete)) fileToDelete.delete();
         /** this highlights the document in the navigator */
         _model.refreshActiveDocument();
+	//File newFile = _model.getActiveDocument().getFile();
+	//DataCollector.RenamedClass(oldFile, newFile);
         return toReturn;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1433,7 +1433,7 @@ private OpenDefinitionsDocument[] _openFiles(File[] files)`
`1433`	`1433`	`for(OpenDefinitionsDocument d : alreadyOpenDocuments) {`
`1434`	`1434`	`_notifier.handleAlreadyOpenDocument(d);`
`1435`	`1435`	`_notifier.fileOpened(d);`
`1436`		`- //DataCollector.openClass(d)`
	`1436`	`+ //DataCollector.openClass(d.getParentDirectory(),d)`
`1437`	`1437`	`}`
`1438`	`1438`	`}`
`1439`	`1439`
`@@ -2092,7 +2092,8 @@ public boolean closeFiles(List<OpenDefinitionsDocument> docs) {`
`2092`	`2092`	`_ensureNotActive(docs);`
`2093`	`2093`
`2094`	`2094`	`// Close the files in docs.`
`2095`		`- for (OpenDefinitionsDocument doc : docs) { closeFileWithoutPrompt(doc); }`
	`2095`	`+ for (OpenDefinitionsDocument doc : docs) { closeFileWithoutPrompt(doc); }`
	`2096`	`+ //for (OpenDefinitionsDocument doc : docs) { DataCollector.closeFile(doc);}`
`2096`	`2097`	`return true;`
`2097`	`2098`	`}`
`2098`	`2099`
Original file line number	Diff line number	Diff line change
`@@ -5148,6 +5148,7 @@ 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);`
`5151`	`5152`	`}`
`5152`	`5153`	`}`
`5153`	`5154`
`@@ -5315,9 +5316,13 @@ private boolean _rename() {`
`5315`	`5316`	`boolean toReturn = _model.getActiveDocument().saveFileAs(_saveAsSelector);`
`5316`	`5317`	`/** Delete the old file if save was successful. */`
`5317`	`5318`	`// TODO: what if delete() fails? (mgricken)`
	`5319`	`+`
	`5320`	`+ //File oldFile = fileToDelete;`
`5318`	`5321`	`if (toReturn && ! _model.getActiveDocument().getFile().equals(fileToDelete)) fileToDelete.delete();`
`5319`	`5322`	`/** this highlights the document in the navigator */`
`5320`	`5323`	`_model.refreshActiveDocument();`
	`5324`	`+ //File newFile = _model.getActiveDocument().getFile();`
	`5325`	`+ //DataCollector.RenamedClass(oldFile, newFile);`
`5321`	`5326`	`return toReturn;`
`5322`	`5327`	`}`
`5323`	`5328`	`}`