DrJava Legacy SVN Repository

Replaced the invokeAndWaith wrapper around listener notification in Configuration.setSetting with invokeLater. The only file modified was:

M src/edu/rice/cs/drjava/config/Configuration.java

This revision contains a tweak to teardown() in MainFrameTest.
Enclosing the call on _frame.dispose in an invokeandWait appears to be
causing a deadlock. The revision also includes a tiny formatting
change in MainFrame. The following files were modified:

M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/MainFrameTest.java

This revision cleans up the code in
FindReplaceMachine/FindReplacePanel in an attempt to make searching
more responsive. The whole word test was coping the text of the
entire document. The revision subjectively feels more responsive but
I don't have any benchmarks to prove it. The tests in MainFrameTest
and DefinitionsPaneTest have been cleaned up; hanging is much less
frequent on my dual core desktop. I am not certain the problem is
completely solved, but I ran about 40 consecutive tests of
MainFrameTest without it hanging, which is a big improvement. The
last goal of this revision was cleaning up the code for quit() in the
MainFrame and global model classes. The dispose method on MainFrame
no longer calls dispose on the model, which is now called only in
tests. The monitoring thread that times out if quitting hangs (on
Windows tablet PC's); we'll see if it has any effect.

The following classes were updated:

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/DefaultGlobalModel.java
M src/edu/rice/cs/drjava/model/FindReplaceMachineTest.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/MainFrameTest.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
M src/edu/rice/cs/drjava/ui/FindReplacePanel.java

This patch is an attempt to fix bug #1571405. I moved the code in the CaretListener.insertUpdate method to the event thread using SwingUtilities.invokeLater rather than Utilities.invokeLater so that the CaretListener code always executes after the other document insertion listeners have run. It moves both the caret and promt which may interfere with other listeners (particularly the prompt). The revision only changed the following file:

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

Removed 'deprecated' warnings by changing Window.show() to
Window.setVisible(true) and using a different ctor for KeyEvent.

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

Fixed method & constructor lookup in raw types

Revised ReduceModelControl.java in an attempt to fix Bug #1565731.

It appears that ColorGlyphPainter.paint is calling
AbstractDJDocument.getHightlightStatus when the reduced model cursor
is atStart, apparently violating an invariant assumed by
ReducedModel.getHighlightStatus. I don't why such an invariant was
assumed since moving the reduced model cursor can place the cursor
atStart.

I have added a check for this condition in
ReducedModelControl.getHighlightStatus, which causes the method to use
the same default values for curLength and curState as it does when the
cursor is atEnd. I also changed the default value of curLength which
looked wrong; the old value was the absolute location of the cursor +
the length of the highlight segment being queried when it should be
simply the length of the highlight segment. Fortunately, the cursor
is rarely atEnd in this context, so the erroneous code was rarely
executed.

The revisions to other files were cosmetic, except for
DefinitionsPaneTest where I added some additional event-queueing call
in an attempt to prevent the memory leak test from occasionally
failing.

The following files were modified:

M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/ui/config/VectorClassnameOptionComponent.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java

Revised the protocol for determining the class name corresponding to a
document. If a document contains a public class, that class is now
identifed as the class name for the document. If no such class
exists, the first class is selected as the class name. Revised
DefinitionsDocumentTest in an attempt to eliminiate occasional
deadlocks in processing keystrokes, but the problem is not completely
solved. The remaining changes were cosmetic. The following files
were updated:

M src/edu/rice/cs/drjava/platform/DefaultPlatform.java
M src/edu/rice/cs/drjava/model/debug/DocumentDebugAction.java
M src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
M src/edu/rice/cs/drjava/model/definitions/ClassNameNotFoundException.java
M src/edu/rice/cs/drjava/model/definitions/ColoringGlyphPainter.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java
M src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java
M src/edu/rice/cs/drjava/model/repl/JavaDebugInterpreter.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/MultiThreadedTestCase.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/KeyBindingManager.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
M src/edu/rice/cs/util/newjvm/SlaveJVMRunner.java

This change fixes bug report
[ 1561534 ] Debug Stepping Over not working with keyboard input

This was not a debugger error. The problem was the way the input box
was inserted into the interactions document, as I already assumed. Due
to the different prompt during debugging, it was inserted in an
invalid place, causing it not to show up and give the user a chance to
hit enter. There was nothing wrong with the debugger.

To insert the component, which is represented by a plain-old string
("[component]" in this case), our own document class was bypassed and
the Swing document accessed directly, probably because creating it was
inconvenient at the time to create a proper style string for the input
box and let our own document class know about it.

As of this revision, the input box will appear and stepping/resuming
will work. When the program finishes, sometimes there are two "> >"
symbols appearing now, so I suggest someone with better knowledge of
the parts of the program that contained the bug should take another
glance at the way the prompts are printed.

I removed the two files edu/rice/cs/util/swing/InputBox.java and
src/edu/rice/cs/util/swing/PopupConsole.java as they are not used
anymore and were red herrings during my initial attempts to locate the
bug. Also removed a retroweaver problem that had to do with my
previous commit for the memory statistics.

M src/edu/rice/cs/drjava/ui/InteractionsController.java
D src/edu/rice/cs/util/swing/PopupConsole.java
D src/edu/rice/cs/util/swing/InputBox.java
M src/edu/rice/cs/util/StringOps.java

Had to change memory statistics for About dialog; used to be generated only once and thus not change.