connect new action and reorganize open connections

y4zhang · y4zhang · commit a438f8a513db · 2017-07-25T15:54:06.000-05:00
diff --git a/drjava/src/edu/rice/cs/drjava/DrJava.java b/drjava/src/edu/rice/cs/drjava/DrJava.java
@@ -57,7 +57,7 @@
 import edu.rice.cs.util.Log;
 import edu.rice.cs.util.UnexpectedException;
 import edu.rice.cs.drjava.model.DrJavaFileUtils;
-import edu.rice.cs.drjava.collect.*;
+//import edu.rice.cs.drjava.collect.*;
 
 /** Startup class for DrJava consisting entirely of static members.  The main method reads the .drjava file (creating 
   * one if none exists) to get the critical information required to start the main JVM for DrJava: 
@@ -246,7 +246,7 @@ public static void main(final String[] args) {
       System.out.println(getOperatingSystem());
       System.out.println(getJavaVersion());
       System.out.println(getInterfaceLanguage());
-      DataCollector.drjavaOpened(getOperatingSystem(),getJavaVersion(),getInterfaceLanguage());
+//      DataCollector.drjavaOpened(getOperatingSystem(),getJavaVersion(),getInterfaceLanguage());
 //    Utilities.showDebug("Calling configureAndLoadDrJavaRoot with args = " + args);
       configureAndLoadDrJavaRoot(args); 
     }
@@ -711,4 +711,4 @@ public static boolean warnIfLinuxWithCompiz() {
       return false; // do not warn
     }
   }
-}
+}
diff --git a/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
@@ -158,6 +158,8 @@
 
 import static edu.rice.cs.plt.debug.DebugUtil.debug;
 
+//import edu.rice.cs.drjava.collect.*;
+
 /** In simple terms, a DefaultGlobalModel without an interpreter, compiler, junit testing, debugger or javadoc.
   * Hence, it only has only document handling functionality
   * @version $Id$
@@ -1231,6 +1233,7 @@ public OpenDefinitionsDocument newFile(String text) {
     if (dir == null) dir = getMasterWorkingDirectory();
     OpenDefinitionsDocument doc = newFile(dir, text);
     setActiveDocument(doc);
+    //DataCollector.newFile(dir, doc);
     return doc;
   }
   
@@ -1430,6 +1433,7 @@ private OpenDefinitionsDocument[] _openFiles(File[] files)
       for(OpenDefinitionsDocument d : alreadyOpenDocuments) {
         _notifier.handleAlreadyOpenDocument(d);
         _notifier.fileOpened(d);
+	//DataCollector.openClass(d)
       }
     }
     
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -9356,7 +9356,6 @@ public void undoableEditHappened() {
     
     public void activeDocumentRefreshed(final OpenDefinitionsDocument active) {
       assert EventQueue.isDispatchThread();
-//          System.err.println("activeDocumentRefreshed");
       _recentDocFrame.pokeDocument(active);
       _refreshDefScrollPane();
       

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,8 @@`
`158`	`158`
`159`	`159`	`import static edu.rice.cs.plt.debug.DebugUtil.debug;`
`160`	`160`
	`161`	`+//import edu.rice.cs.drjava.collect.*;`
	`162`	`+`
`161`	`163`	`/** In simple terms, a DefaultGlobalModel without an interpreter, compiler, junit testing, debugger or javadoc.`
`162`	`164`	`* Hence, it only has only document handling functionality`
`163`	`165`	`* @version $Id$`
`@@ -1231,6 +1233,7 @@ public OpenDefinitionsDocument newFile(String text) {`
`1231`	`1233`	`if (dir == null) dir = getMasterWorkingDirectory();`
`1232`	`1234`	`OpenDefinitionsDocument doc = newFile(dir, text);`
`1233`	`1235`	`setActiveDocument(doc);`
	`1236`	`+ //DataCollector.newFile(dir, doc);`
`1234`	`1237`	`return doc;`
`1235`	`1238`	`}`
`1236`	`1239`
`@@ -1430,6 +1433,7 @@ private OpenDefinitionsDocument[] _openFiles(File[] files)`
`1430`	`1433`	`for(OpenDefinitionsDocument d : alreadyOpenDocuments) {`
`1431`	`1434`	`_notifier.handleAlreadyOpenDocument(d);`
`1432`	`1435`	`_notifier.fileOpened(d);`
	`1436`	`+ //DataCollector.openClass(d)`
`1433`	`1437`	`}`
`1434`	`1438`	`}`
`1435`	`1439`