DrJava Legacy SVN Repository

Fixed Java5 compilation problem wrt. @Override on interface method implementations.

Added ScrollableListSelectionDialog. Updated JavaDoc in ScrollableListDialog.

Fixed a long-standing bug that involved DrJava highlights taking precedence over selected text highlighting. This was fixed by enforcing an ordering on the highlights by an insert-in-order operation when a highlight is added. The ordering is as follows (from most important to least):
DefaultUnderlineHighlightPainter (used for underlines as in find all)
DefaultFrameHighlightPainter (used to draw a box around the highlighted text)
DefaultHighlightPainter (now called only by Swing for a normal highlight)
DrJavaHighlightPainter (a normal highlight requested by DrJava)

The DrJavaHighlightPainter nested class was added in order to differentiate between highlights created by DrJava and those created by Swing (this helps us find the selected text highlight and raise its priority). The insert-in-order operation may cause a slight performance decrease, but is not intended as a long-term solution. Ideally, a better type of storage will be used to make inserting a quicker operation.

M src/edu/rice/cs/drjava/ui/DefinitionsPane.java
M src/edu/rice/cs/drjava/ui/ErrorPanel.java
M src/edu/rice/cs/drjava/ui/AbstractDJPane.java
M src/edu/rice/cs/drjava/ui/ReverseHighlighter.java
M src/edu/rice/cs/util/swing/HighlightManagerTest.java

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