Skip to content

Commit 641b153

Browse files
ponderosaTXponderosaTX
committed
This revision comments out more irrelevant code involving the disabled
debugger and streamlines resetting the interactions pane using the internal (:reset) feature added to the Scala interpreter in 2.10. Some minor tweaking is still necessary since the reset process generates an additional prompt without erasing the old one. The following files were modified. The changes to IOUtil only involved the formatting of comments, so the jar file for plt was not changed in drjava/lib. modified: build.xml modified: src/edu/rice/cs/drjava/DrScalaRoot.java modified: src/edu/rice/cs/drjava/config/OptionConstants.java modified: src/edu/rice/cs/drjava/model/AbstractGlobalModel.java modified: src/edu/rice/cs/drjava/model/DefaultGlobalModel.java modified: src/edu/rice/cs/drjava/model/DummyGlobalModel.java modified: src/edu/rice/cs/drjava/model/GlobalModel.java modified: src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelTestCase.java modified: src/edu/rice/cs/drjava/model/compiler/ScalaCompilerInterface.java modified: src/edu/rice/cs/drjava/model/debug/jpda/DebugAction.java modified: src/edu/rice/cs/drjava/model/debug/jpda/DebugContextTest.java modified: src/edu/rice/cs/drjava/model/debug/jpda/DebugTest.java modified: src/edu/rice/cs/drjava/model/debug/jpda/DocumentDebugAction.java modified: src/edu/rice/cs/drjava/model/debug/jpda/EventHandlerThread.java modified: src/edu/rice/cs/drjava/model/debug/jpda/JPDABreakpoint.java modified: src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugTestCase.java modified: src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java modified: src/edu/rice/cs/drjava/model/debug/jpda/PendingRequestManager.java modified: src/edu/rice/cs/drjava/model/debug/jpda/Step.java modified: src/edu/rice/cs/drjava/model/definitions/ColoringGlyphPainter.java modified: src/edu/rice/cs/drjava/model/definitions/ColoringView.java modified: src/edu/rice/cs/drjava/model/repl/InteractionsDJDocument.java modified: src/edu/rice/cs/drjava/model/repl/InteractionsDocument.java modified: src/edu/rice/cs/drjava/model/repl/InteractionsModel.java modified: src/edu/rice/cs/drjava/model/repl/RMIInteractionsModel.java modified: src/edu/rice/cs/drjava/model/repl/newjvm/DrScalaInterpreter.java modified: src/edu/rice/cs/drjava/model/repl/newjvm/NewJVMTest.java modified: src/edu/rice/cs/drjava/ui/BreakpointsPanel.java modified: src/edu/rice/cs/drjava/ui/DebugPanel.java modified: src/edu/rice/cs/drjava/ui/DefinitionsPane.java modified: src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java modified: src/edu/rice/cs/drjava/ui/InteractionsController.java modified: src/edu/rice/cs/drjava/ui/MainFrame.java modified: src/edu/rice/cs/drjava/ui/config/ConfigDescriptions.java modified: src/edu/rice/cs/drjava/ui/config/ConfigFrame.java modified: src/edu/rice/cs/util/newjvm/IntegratedMasterSlaveTest.java modified: ../plt/src/edu/rice/cs/plt/io/IOUtil.java
1 parent d7fa23a commit 641b153

38 files changed

+6904
-6646
lines changed

‎drjava/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375

376376
<target name="test-8" depends="compile, resolve-java7-exec, resolve-java8-tools" unless="skip-test"
377377
description="Run all tests under Java 8 (after compiling); use -Dtest-spec=... to filter">
378-
<echo message="ConcJUnit is currently incompatible with Java 7."/>
378+
<echo message="ConcJUnit is currently incompatible with Java 8."/>
379379
<antcall target="iterate-tests">
380380
<param name="test-jvm" value="${java8-exec}" />
381381
<param name="test-tools" value="${java8-tools}" />

‎drjava/src/edu/rice/cs/drjava/DrScalaRoot.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@
7171
/** Main class for DrJava.
7272
* @version $Id: DrScalaRoot.java 5668 2012-08-15 04:58:30Z rcartwright $
7373
*/
74-
public class DrScalaRoot {
75-
/** Class to probe to see if the debugger is available */
76-
public static final String TEST_DEBUGGER_CLASS = "com.sun.jdi.Bootstrap";
74+
public class DrScalaRoot {
75+
76+
/* Debugger deactivated in DrScala */
77+
// /** Class to probe to see if the debugger is available */
78+
// public static final String TEST_DEBUGGER_CLASS = "com.sun.jdi.Bootstrap";
7779

7880
public static final String PLASTIC_THEMES_PACKAGE = "com.jgoodies.looks.plastic.theme";
7981

‎drjava/src/edu/rice/cs/drjava/config/OptionConstants.java‎

Lines changed: 141 additions & 123 deletions
Large diffs are not rendered by default.

‎drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java‎

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,14 +1710,15 @@ else if (doc.isAuxiliaryFile()) {
17101710
int createJarFlags = getCreateJarFlags();
17111711
if (createJarFlags != 0) builder.setCreateJarFlags (createJarFlags);
17121712

1713+
/* Debugger is deactivated in DrScala */
17131714
// add breakpoints and watches
1714-
ArrayList<DebugBreakpointData> l = new ArrayList<DebugBreakpointData>();
1715-
for (OpenDefinitionsDocument odd: _breakpointManager.getDocuments()) {
1716-
for(Breakpoint bp: _breakpointManager.getRegions(odd)) { l.add(bp); }
1717-
}
1718-
builder.setBreakpoints(l);
1719-
try { builder.setWatches(getDebugger().getWatches()); }
1720-
catch(DebugException de) { /* ignore, just don't store watches */ }
1715+
// ArrayList<DebugBreakpointData> l = new ArrayList<DebugBreakpointData>();
1716+
// for (OpenDefinitionsDocument odd: _breakpointManager.getDocuments()) {
1717+
// for(Breakpoint bp: _breakpointManager.getRegions(odd)) { l.add(bp); }
1718+
// }
1719+
// builder.setBreakpoints(l);
1720+
// try { builder.setWatches(getDebugger().getWatches()); }
1721+
// catch(DebugException de) { /* ignore, just don't store watches */ }
17211722

17221723
// add bookmarks
17231724
builder.setBookmarks(_bookmarkManager.getFileRegions());
@@ -1938,31 +1939,33 @@ public boolean accept(OpenDefinitionsDocument d) {
19381939
public File[] getFiles() { return filesToOpen; }
19391940
});
19401941

1941-
/* Files are opened synchronously by the preceding notification. If this process is made asynchronous, we need to
1942-
* wait here (using the projectLoaded CompletionMonitor above (commented out). */
1943-
// set breakpoints
1944-
for (DebugBreakpointData dbd: ir.getBreakpoints()) {
1945-
try {
1946-
File f = dbd.getFile();
1947-
if (! modifiedFiles.contains(f)) {
1948-
int lnr = dbd.getLineNumber();
1949-
OpenDefinitionsDocument odd = getDocumentForFile(f);
1950-
getDebugger().toggleBreakpoint(odd, odd._getOffset(lnr), dbd.isEnabled());
1951-
}
1952-
}
1953-
catch(DebugException de) { /* ignore, just don't add breakpoint */ }
1954-
}
1942+
/* Debugger is deactivated in DrScala */
1943+
// /* Files are opened synchronously by the preceding notification. If this process is made asynchronous, we need to
1944+
// * wait here (using the projectLoaded CompletionMonitor above (commented out). */
1945+
// // set breakpoints
1946+
// for (DebugBreakpointData dbd: ir.getBreakpoints()) {
1947+
// try {
1948+
// File f = dbd.getFile();
1949+
// if (! modifiedFiles.contains(f)) {
1950+
// int lnr = dbd.getLineNumber();
1951+
// OpenDefinitionsDocument odd = getDocumentForFile(f);
1952+
// getDebugger().toggleBreakpoint(odd, odd._getOffset(lnr), dbd.isEnabled());
1953+
// }
1954+
// }
1955+
// catch(DebugException de) { /* ignore, just don't add breakpoint */ }
1956+
// }
19551957

19561958
//Set active document from project file
19571959
if (active != null) setActiveDocument(getDocumentForFile(active));
19581960

1959-
// set watches
1960-
try { getDebugger().removeAllWatches(); }
1961-
catch(DebugException de) { /* ignore, just don't remove old watches */ }
1962-
for (DebugWatchData dwd: ir.getWatches()) {
1963-
try { getDebugger().addWatch( dwd.getName()); }
1964-
catch(DebugException de) { /* ignore, just don't add watch */ }
1965-
}
1961+
/* Debugger is deactivated in DrScala */
1962+
// // set watches
1963+
// try { getDebugger().removeAllWatches(); }
1964+
// catch(DebugException de) { /* ignore, just don't remove old watches */ }
1965+
// for (DebugWatchData dwd: ir.getWatches()) {
1966+
// try { getDebugger().addWatch( dwd.getName()); }
1967+
// catch(DebugException de) { /* ignore, just don't add watch */ }
1968+
// }
19661969

19671970
// set bookmarks
19681971
for (FileRegion bm: ir.getBookmarks()) {
@@ -2528,10 +2531,11 @@ protected void _docAppend(final ConsoleDocument doc, final String s, final Strin
25282531
/** Prints to the DrScala console as an echo of System.in. This method can safely be run outside the event thread. */
25292532
public void systemInEcho(final String s) { _docAppend(_consoleDoc, s, ConsoleDocument.SYSTEM_IN_STYLE); }
25302533

2531-
/** throws UnsupportedOperationException */
2532-
public void printDebugMessage(String s) {
2533-
throw new UnsupportedOperationException("AbstractGlobalModel does not support debugging");
2534-
}
2534+
/* Debugger deactivated in DrScala */
2535+
// /** throws UnsupportedOperationException */
2536+
// public void printDebugMessage(String s) {
2537+
// throw new UnsupportedOperationException("AbstractGlobalModel does not support debugging");
2538+
// }
25352539

25362540
/** throws new UnsupportedOperationException */
25372541
public Iterable<File> getInteractionsClassPath() {
@@ -2630,8 +2634,11 @@ public File getSourceFile(String fileName) {
26302634
File f = _getSourceFileFromPath(fileName, s);
26312635
if (f != null) return f;
26322636
}
2633-
Vector<File> sourcepath = DrScala.getConfig().getSetting(OptionConstants.DEBUG_SOURCEPATH);
2634-
return findFileInPaths(fileName, sourcepath);
2637+
2638+
/* Debugger deactivated in DrScala */
2639+
// Vector<File> sourcepath = DrScala.getConfig().getSetting(OptionConstants.DEBUG_SOURCEPATH);
2640+
// return findFileInPaths(fileName, sourcepath);
2641+
return FileOps.NULL_FILE;
26352642
}
26362643

26372644
/** Searches for a file with the given name on the provided paths. Returns NULL_FILE if the file is not found.

‎drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
/** Handles the bulk of DrJava's program logic. The UI components interface with the GlobalModel through its public
9999
* methods, and the GlobalModel responds via the GlobalModelListener interface. This removes the dependency on the
100100
* UI for the logical flow of the program's features. With the current implementation, we can finally test the compile
101-
* functionality of DrJava, along with many other things. <p>
101+
* command of DrJava, along with many other things. <p>
102102
* @version $Id: DefaultGlobalModel.java 5727 2012-09-30 03:58:32Z rcartwright $
103103
*/
104104
public class DefaultGlobalModel extends AbstractGlobalModel {
@@ -456,7 +456,7 @@ public void resetInteractions(File wd, boolean forceReset) {
456456
forceReset |= !wd.equals(workDir);
457457
// update the setting
458458
DrScala.getConfig().setSetting(LAST_INTERACTIONS_DIRECTORY, wd);
459-
getDebugger().setAutomaticTraceEnabled(false);
459+
// getDebugger().setAutomaticTraceEnabled(false);
460460
_interactionsModel.resetInterpreter(wd, forceReset);
461461
debug.logEnd();
462462
}
@@ -519,11 +519,12 @@ public String getHistoryAsString() {
519519
return _interactionsModel.getDocument().getHistoryAsString();
520520
}
521521

522-
/** Called when the debugger wants to print a message. Inserts a newline. */
523-
public void printDebugMessage(String s) {
524-
_interactionsModel.getDocument().
525-
insertBeforeLastPrompt(s + "\n", InteractionsDocument.DEBUGGER_STYLE);
526-
}
522+
/* Debugger deactivated in DrScala */
523+
// /** Called when the debugger wants to print a message. Inserts a newline. */
524+
// public void printDebugMessage(String s) {
525+
// _interactionsModel.getDocument().
526+
// insertBeforeLastPrompt(s + "\n", InteractionsDocument.DEBUGGER_STYLE);
527+
// }
527528

528529
/** Returns the current class path in use by the Interpreter JVM. */
529530
public Iterable<File> getInteractionsClassPath() {
@@ -628,26 +629,26 @@ public void interpreterReady(File wd) {
628629
* as soon as possible. */
629630

630631
_interactionsModel.removeListener(_runMain); // listener cannot run
631-
632-
// Run debugger restart in an invokeLater so that the InteractionsModel EventNotifier
633-
// reader-writer lock isn't held anymore.
634-
javax.swing.SwingUtilities.invokeLater(new Runnable() {
635-
public void run() {
636-
// Restart debugger if it was previously enabled and is now off
637-
if (wasDebuggerEnabled && (! getDebugger().isReady())) {
638-
// System.err.println("Trying to start debugger");
639-
try { getDebugger().startUp(); } catch(DebugException de) { /* ignore, continue without debugger */ }
640-
}
641-
// Load the proper text into the interactions document
642-
iDoc.clearCurrentInput();
643-
iDoc.append(java.text.MessageFormat.format(command, className), null);
644-
645-
// Finally, execute the new interaction and record that event
646-
new Thread("Running document") {
647-
public void run() { _interactionsModel.interpretCurrentInteraction(); }
648-
}.start();
649-
}
650-
});
632+
/* Debugger de-activated in DrScala */
633+
// // Run debugger restart in an invokeLater so that the InteractionsModel EventNotifier
634+
// // reader-writer lock isn't held anymore.
635+
// javax.swing.SwingUtilities.invokeLater(new Runnable() {
636+
// public void run() {
637+
// // Restart debugger if it was previously enabled and is now off
638+
// if (wasDebuggerEnabled && (! getDebugger().isReady())) {
639+
//// System.err.println("Trying to start debugger");
640+
// try { getDebugger().startUp(); } catch(DebugException de) { /* ignore, continue without debugger */ }
641+
// }
642+
// // Load the proper text into the interactions document
643+
// iDoc.clearCurrentInput();
644+
// iDoc.append(java.text.MessageFormat.format(command, className), null);
645+
//
646+
// // Finally, execute the new interaction and record that event
647+
// new Thread("Running document") {
648+
// public void run() { _interactionsModel.interpretCurrentInteraction(); }
649+
// }.start();
650+
// }
651+
// });
651652
}
652653
};
653654

@@ -868,6 +869,7 @@ public void resetInteractionsClassPath() {
868869
if (projectExtras != null) for (File cpE : projectExtras) { _interactionsModel.addProjectClassPath(cpE); }
869870

870871
Vector<File> cp = DrScala.getConfig().getSetting(EXTRA_CLASSPATH);
872+
System.err.println("Extra class path used in resetInteraction is: '" + cp + "'");
871873
if (cp != null) {
872874
for (File f : cp) { _interactionsModel.addExtraClassPath(f); }
873875
}

‎drjava/src/edu/rice/cs/drjava/model/DummyGlobalModel.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,10 @@ public String getHistoryAsString() {
360360
throw new UnsupportedOperationException("Tried to call getHistory on a Dummy");
361361
}
362362

363-
public void printDebugMessage(String s) {
364-
throw new UnsupportedOperationException("Tried to call printDebugMessage on a Dummy");
365-
}
363+
/* Debugger deactivated in DrScala */
364+
// public void printDebugMessage(String s) {
365+
// throw new UnsupportedOperationException("Tried to call printDebugMessage on a Dummy");
366+
// }
366367

367368
public int getDebugPort() throws IOException {
368369
throw new UnsupportedOperationException("Tried to call getDebugPort on a Dummy");

‎drjava/src/edu/rice/cs/drjava/model/GlobalModel.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,14 @@ public InteractionsScriptModel loadHistoryAsScript(FileOpenSelector selector)
377377

378378
//------------------------------- Debugger -------------------------------//
379379

380-
/** Called when the debugger wants to print a message. */
381-
public void printDebugMessage(String s);
382-
383-
/** Returns an available port number to use for debugging the interactions JVM.
384-
* @throws IOException if unable to get a valid port number.
385-
*/
386-
public int getDebugPort() throws IOException;
380+
/* Debugger deactivated in DrScala */
381+
// /** Called when the debugger wants to print a message. */
382+
// public void printDebugMessage(String s);
383+
//
384+
// /** Returns an available port number to use for debugging the interactions JVM.
385+
// * @throws IOException if unable to get a valid port number.
386+
// */
387+
// public int getDebugPort() throws IOException;
387388

388389
//--------------------------------- Misc ---------------------------------//
389390

‎drjava/src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,8 @@ public void testInteractionsCanSeeCompiledClasses() throws BadLocationException,
157157

158158
// Compile Foo
159159
OpenDefinitionsDocument doc1 = setupDocument(FOO_TEXT);
160-
File dir1 = makeCanonical(new File(_tempDir, "dir1"));
161-
dir1.mkdir();
162-
File file1 = makeCanonical(new File(dir1, "TestFile1.scala"));
160+
File dir1 = tempDirectory("dir1");
161+
File file1 = tempFile("TestFile1", dir1);
163162
// System.err.println("Original class Path is: " + _model.getInteractionsClassPath());
164163
doCompile(doc1, file1);
165164
// System.err.println("After loading " + file1 + ", class Path is now: " + _model.getInteractionsClassPath());
@@ -181,20 +180,19 @@ public void testInteractionsCanSeeCompiledClasses() throws BadLocationException,
181180

182181
// Compile Baz which extends Foo in another directory.
183182
OpenDefinitionsDocument doc2 = setupDocument(BAZ_TEXT);
184-
File dir2 = makeCanonical(new File(_tempDir, "dir2"));
185-
dir2.mkdir();
186-
File file2 = makeCanonical(new File(dir2, "TestFile2.scala"));
183+
File dir2 = tempDirectory("dir2");
184+
File file2 = tempFile("TestFile2", dir2);
187185
doCompile(doc2, file2);
188186

189187
// Ensure that Baz can use the Foo class from extra classpath
190-
assertEquals("interactions result", "z: java.lang.String = DrScalaTestBaz$",
188+
assertEquals("interactions result", "z: String = DrScalaTestBaz$",
191189
interpret("val z = DrScalaTestBaz.getClass().getName()"));
192190

193191
// Ensure that static fields can be seen
194192
assertEquals("result of singleton field", "y: Int = 3", interpret("val y = DrScalaTestBaz.x"));
195193

196194
// Also ensure that Foo can be used directly
197-
assertEquals("interactions result", "x: java.lang.String = DrScalaTestFoo",
195+
assertEquals("interactions result", "x: String = DrScalaTestFoo",
198196
interpret("val x = new DrScalaTestFoo().getClass().getName()"));
199197

200198
_log.log("testInteractionsCanSeeCompletedClasses completed");
@@ -493,6 +491,8 @@ public void testInteractionsLiveUpdateClassPath() throws BadLocationException, E
493491
String tempPath = f.getParent();
494492
File tempDir = makeCanonical(new File(tempPath));
495493
tempDir.renameTo(makeCanonical(new File(tempPath + "a")));
494+
tempDir.deleteOnExit();
495+
System.err.println("Renamed directory = '" + tempDir + "'");
496496

497497
String result = interpret("new DrScalaTestFoo().getClass().getName()");
498498

@@ -501,18 +501,32 @@ public void testInteractionsLiveUpdateClassPath() throws BadLocationException, E
501501
assertFalse("interactions should have an error, not the correct answer", "\"DrScalaTestFoo\"".equals(result));
502502
// System.err.println("Result1 is: " + result);
503503

504+
System.err.println("Classpath before extension = '" + _model.getInteractionsClassPath() + "'");
505+
504506
// Add new directory to classpath through Config
505507
Vector<File> cp = new Vector<File>();
506-
cp.add(makeCanonical(new File(tempPath + "a")));
508+
509+
File renamedDir = makeCanonical(new File(tempPath + "a"));
510+
renamedDir.deleteOnExit();
511+
/* renamedDir is NOT the same as tempDir which was NOT mutated by renameTo method */
512+
// assertEquals("File.renameTo modifies its receiver", tempDir, renamedDir);
513+
cp.add(renamedDir);
514+
System.err.println("Extra Classpath = '" + cp + "'");
507515
DrScala.getConfig().setSetting(EXTRA_CLASSPATH, cp);
508516

509517
Utilities.clearEventQueue();
510518
_model.resetInteractionsClassPath();
511519

512-
// example format of REPL result: res0: java.lang.String = DrScalaTestFoo
520+
Iterable<File> newCp = _model.getInteractionsClassPath();
521+
System.err.println("New class path is:\n" + IterUtil.multilineToString(newCp));
522+
System.err.println("Classpath after extension = '" + _model.getInteractionsClassPath() + "'");
523+
Utilities.show("Pause to inspect class path including " + cp);
524+
525+
// example format of REPL result: res0: String = DrScalaTestFoo
513526
String pattern = "\\s*res[0-9]+: String = DrScalaTestFoo\\s*";
514527
result = interpret("new DrScalaTestFoo().getClass().getName()");
515-
528+
System.err.println("result = '" + result + "'; pattern = '" + pattern + "'");
529+
516530
// Now it should be on the classpath
517531
assertTrue("interactions result matches pattern", result.matches(pattern));
518532
System.err.println("result = '" + result + "'");

‎drjava/src/edu/rice/cs/drjava/model/GlobalModelTestCase.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
*/
7676
public abstract class GlobalModelTestCase extends MultiThreadedTestCase {
7777

78-
public static final Log _log = new Log("GlobalModel.txt", false);
78+
public static final Log _log = new Log("GlobalModel.txt", true);
7979

8080
protected volatile DefaultGlobalModel _model;
8181
protected volatile InteractionsController _interactionsController;
@@ -191,11 +191,30 @@ protected File tempFile(int i) throws IOException {
191191
return File.createTempFile("DrScala-test" + i, ".scala", _tempDir).getCanonicalFile();
192192
}
193193

194+
/** Create a new NAMED (last segment of qualified class name) temporary file in _tempDir. */
195+
protected File tempFile(String name) throws IOException {
196+
File f = File.createTempFile(name, ".scala", _tempDir).getCanonicalFile();
197+
// System.err.println("temp file created with name " + f);
198+
return f;
199+
}
200+
201+
/** Create a new NAMED (last segment of qualified class name) temporary file in specified location. */
202+
protected File tempFile(String name, File location) throws IOException {
203+
File f = File.createTempFile(name, ".scala", location).getCanonicalFile();
204+
// System.err.println("temp file created with name " + f);
205+
return f;
206+
}
207+
194208
/** Create a new temporary directory in _tempDir. */
195209
protected File tempDirectory() throws IOException {
196210
return IOUtil.createAndMarkTempDirectory("DrScala-test", "", _tempDir);
197211
}
198212

213+
/** Create a new NAMED temporary directory in _tempDir. */
214+
protected File tempDirectory(String name) throws IOException {
215+
return IOUtil.createAndMarkTempDirectory(name, "", _tempDir);
216+
}
217+
199218
protected File createFile(String name) { return new File(_tempDir, name); }
200219

201220
/** Given a .java file and a class file name, returns the corresponding .class file. */
@@ -975,7 +994,7 @@ public void updateCurrentLocationInDoc() { /* this event is not directly tested
975994
}
976995

977996
public static class InteractionListener extends TestListener {
978-
private static final int WAIT_TIMEOUT = 20000; // time to wait for _interactionDone or _resetDone
997+
private static final int WAIT_TIMEOUT = 100000; // time to wait for _interactionDone or _resetDone
979998
private volatile CompletionMonitor _interactionDone;
980999
private volatile CompletionMonitor _resetDone;
9811000

‎drjava/src/edu/rice/cs/drjava/model/compiler/ScalaCompilerInterface.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import java.io.File;
4040

41-
/* This interfaced has been DEPRECATED. The output dir in flat file mode is the common source root. A set of files
41+
/* This interface has been DEPRECATED. The output dir in flat file mode is the common source root. A set of files
4242
* without a common root cannot be compiled in flat file mode. */
4343

4444
/** An interface extending CompilerInterface; the new methods getOutputDir and setOutputDir are required to support

0 commit comments

Comments
 (0)