DrJava: Incorporated bug fix in plt.jar; fixed auto-import dialog

dlsmith · dlsmith · commit b125d4a35b22 · 2007-12-12T22:40:51.000Z
git-svn-id: file:///tmp/test-svn/trunk@4282 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/lib/plt.jar b/drjava/lib/plt.jar
diff --git a/drjava/lib/readme.txt b/drjava/lib/readme.txt
@@ -8,11 +8,11 @@ VERSIONS:
 asm-3.1.jar:              ASM 3.1 (http://asm.objectweb.org)
 bcel-5.1-pruned.jar:      BCEL 5.1; unneeded class files removed (see javalanglevels)
 docs.jar:                 docs-20060901-2010
-dynamicjava-base-15.jar:  dynamicjava-20071204-2144
+dynamicjava-base-15.jar:  dynamicjava-20071212-1808
 javalanglevels.jar:       javalanglevels-20070213-2052
 junit.jar:                JUnit 3.8.1
 platform.jar:             platform-20070213-2003
-plt.jar:                  plt-20071203-2149
+plt.jar:                  plt-20071212-2207
 retroweaver-rt-1.2.3.jar: Retroweaver 1.2.3
 winlaf-0.5.1.jar:         WinLAF 0.5.1
 
diff --git a/drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
@@ -104,6 +104,8 @@
 
 import java.io.*;
 
+import static edu.rice.cs.plt.debug.DebugUtil.debug;
+
 /** Handles the bulk of DrJava's program logic. The UI components interface with the GlobalModel through its public
  *  methods, and the GlobalModel responds via the GlobalModelListener interface. This removes the dependency on the 
  *  UI for the logical flow of the program's features.  With the current implementation, we can finally test the compile
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -7429,7 +7429,7 @@ public void interactionEnded() {
           // check that this error is different than the last one (second to last may be null):
           if (!lastError.equals(im.getSecondToLastError())) {
             // this aborts the auto-importing if the same class comes up twice in a row
-            if (lastError.startsWith("Undefined class '") && lastError.endsWith("'")) {
+            if (lastError.startsWith("Static Error: Undefined class '") && lastError.endsWith("'")) {
               // it was an "undefined class" exception
               // show auto-import dialog
               String undefinedClassName = lastError.substring(lastError.indexOf('\'')+1,
diff --git a/drjava/src/edu/rice/cs/util/PreventExitSecurityManager.java b/drjava/src/edu/rice/cs/util/PreventExitSecurityManager.java
@@ -69,7 +69,7 @@ public class PreventExitSecurityManager extends SecurityManager {
    *  @param parent SecurityManager to delegate permission to. This may be null, signifying to allow all.
    */
   private PreventExitSecurityManager(final SecurityManager parent) { _parent = parent;
-    edu.rice.cs.util.Log log = new edu.rice.cs.util.Log("secman.txt",true);
+    edu.rice.cs.util.Log log = new edu.rice.cs.util.Log("secman.txt",false);
     log.log("Creating new PreventExitSecurityManager");
   }
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public class PreventExitSecurityManager extends SecurityManager {`
`69`	`69`	`* @param parent SecurityManager to delegate permission to. This may be null, signifying to allow all.`
`70`	`70`	`*/`
`71`	`71`	`private PreventExitSecurityManager(final SecurityManager parent) { _parent = parent;`
`72`		`- edu.rice.cs.util.Log log = new edu.rice.cs.util.Log("secman.txt",true);`
	`72`	`+ edu.rice.cs.util.Log log = new edu.rice.cs.util.Log("secman.txt",false);`
`73`	`73`	`log.log("Creating new PreventExitSecurityManager");`
`74`	`74`	`}`
`75`	`75`