DrJava Legacy SVN Repository

This revision fixes a focus bug in the interactions pane. After
interpreting an interaction that reads from the console (like "new
java.util.Scanner(System.in).nextInt()", DrJava prints the result and
moves the focus to the definitions pane. This revision appears to fix
that problem.

One line in the following file was changed:

M src/edu/rice/cs/drjava/ui/InteractionsController.java

Fixes the NullPointerException in Bug #1689411.

This commit cleans up the coding of the method FileOps.readFileAsSwingText based on suggestions by Corey Shaw. The following file was the only file changed:

M src/edu/rice/cs/util/FileOps.java

This commit finishes (I hope) the cleanup of document image caching.
It converts all forms of newLine (Mac OS9, Windows, Unix) to '\n' (the
Swing internal representation for newLine). When a Swing document is
constructed, DrJava sets the line separator property to the line
separator for hte executing system.

The following files were modified:

M src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java
M src/edu/rice/cs/drjava/model/FindReplaceMachineTest.java
M src/edu/rice/cs/drjava/model/repl/SimpleInteractionsModel.java
M src/edu/rice/cs/drjava/model/repl/History.java
M src/edu/rice/cs/drjava/model/repl/HistoryTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDocumentTest.java
M src/edu/rice/cs/drjava/model/repl/JavaDebugInterpreterTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
M src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
M src/edu/rice/cs/drjava/model/repl/DefaultInteractionsModel.java
M src/edu/rice/cs/drjava/model/repl/RMIInteractionsModel.java
M src/edu/rice/cs/drjava/model/MultiThreadedTestCase.java
M src/edu/rice/cs/drjava/model/compiler/CompilerErrorModel.java
M src/edu/rice/cs/drjava/model/FindReplaceMachine.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/RecentDocFrame.java
M src/edu/rice/cs/drjava/ui/ConsoleControllerTest.java
M src/edu/rice/cs/drjava/ui/ClipboardHistoryFrame.java
M src/edu/rice/cs/util/FileOps.java
M src/edu/rice/cs/util/text/ConsoleDocument.java
M src/edu/rice/cs/util/text/ConsoleDocumentTest.java
M src/edu/rice/cs/util/StringOps.java
M src/edu/rice/cs/util/jar/ManifestWriter.java
M src/edu/rice/cs/util/UnexpectedException.java
M src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java

Changed the ConcreteOpenDefDoc's makeReconstructor method to load the text through the image with a StringReader (using the default editor kit). Previously, the text was simply inserted into the document, and the EOL characters were not processed correctly.

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

Changed a \n to line.separator in InteractionsModel.

M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java

Disabled logging in InteractionsController.java

This revision includes many small changes targeted at fixing bugs in
the behavior of the interactions pane cursor when output is happening
in the background. The following files were modified:

M src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
M src/edu/rice/cs/drjava/model/cache/DocumentCache.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDocument.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
M src/edu/rice/cs/drjava/model/repl/DefaultInteractionsModel.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/CommandLineTest.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/InteractionsPane.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java
M src/edu/rice/cs/drjava/ui/AbstractDJPane.java
M src/edu/rice/cs/drjava/ui/MainFrameTest.java
M src/edu/rice/cs/drjava/ui/InteractionsPaneTest.java
M src/edu/rice/cs/drjava/ui/InteractionsController.java
M src/edu/rice/cs/drjava/ui/JUnitPanel.java
M src/edu/rice/cs/drjava/ui/AbstractConsoleController.java
M src/edu/rice/cs/util/text/ConsoleDocument.java
M src/edu/rice/cs/util/text/ConsoleDocumentTest.java
M src/edu/rice/cs/util/text/EditDocumentInterface.java
M src/edu/rice/cs/util/text/SwingDocument.java
M src/edu/rice/cs/util/OutputStreamRedirector.java
M src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java

Changed DefinitionsPane.getCurrentLine back to a 1-based
numbering system. In revision, 4179, it was inadvertantly
changed to be 0-based. This caused the breakpoints to be
off by one line.

M src/edu/rice/cs/drjava/model/debug/Debugger.java
M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java

This problem fixes bug [ 1679178 ] 100% CPU use when compiling.
M src/edu/rice/cs/drjava/model/compiler/CompilerErrorModel.java