DrJava Legacy SVN Repository

This commit contains a modest cleanup of some ReducedModel/AbstractDJDocument code. In addition, synchronization is added to the indent keystroke action in DefintionsPane and the construction of the findall panel and document highlights in FindReplacePanel.

The following files were modified:

M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsComment.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInPrevStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithSkipComments.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelComment.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/AbstractReducedModel.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ModelListTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ModelList.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/model/DJDocument.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java
M src/edu/rice/cs/drjava/ui/FindReplacePanel.java

This commit corrects a performance bug that I introduced earlier this
year. It eliminates write lock bracketing around the action performed
withn the method _processAllInCurrentDoc on the document corresponding
to the results collection being processed. I had added the write lock bracketing
to accommodate possible modification of the document. But
processAll (which is the only method that calls
_processAllInCurrentDoc) is only passed commands that do not touch the
corresponding DefintionsDocument. I narrowed the contract accordingly
and dropped the write lock bracketing.

The acquireWriteLock() operation forced the current
openDefinitionsDocument to be realized (constructing the virtualized
DefinitionsDocument embedded within).

The following files were modified, most of them incidentally:

M src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M src/edu/rice/cs/drjava/model/cache/DocumentCache.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.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/FindReplacePanel.java
M src/edu/rice/cs/util/text/ConsoleDocument.java
M src/edu/rice/cs/util/text/SwingDocument.java
M src/edu/rice/cs/util/swing/HighlightManager.java

This commit includes many small changes to the reduced model and
indenting code, which presumably will clean up the behavior of
indenting in some special cases. In addition, it attempts to
formalize the locking protocols for the _styleList added in
InteractionsDJDocument (treating akin the the reduced model extension
in AbstractDJDocument).

The following files were modified:

M src/edu/rice/cs/drjava/model/definitions/indent/QuestionInsideComment.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartStmtOfBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/IndentRule.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurly.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/reducedmodel/AbstractReducedModel.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelTest.java
M src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDJDocument.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDJDocumentTest.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/model/DJDocument.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputFrame.java
M src/edu/rice/cs/drjava/ui/config/VectorOptionComponent.java
M src/edu/rice/cs/drjava/ui/BrowserHistoryPanel.java
M src/edu/rice/cs/drjava/ui/BreakpointsPanel.java
M src/edu/rice/cs/drjava/ui/InteractionsController.java
M src/edu/rice/cs/util/text/ConsoleDocument.java
M src/edu/rice/cs/util/text/SwingDocument.java

Fixed [1914055]: class names for tests were being extracted using internal names ("foo/bar/Class") rather than dotted names ("foo.bar.Class").

Changed max heap size selection from textbox to drop-down box
with several choices. Also streamlined the look of the Preferences
panel, even though that should be considered experimental.

PLT Utilities: Added support for different charset encodings to System.out and System.err logs

This commit includes a minor cleanup of the reduced model and the
indenter, but the behavior of the indenter still leaves much to be
desired. I am hopeful that the reduced model is now intelligible
enough to support more significant improvements to the indenter.

The following files were modifed (many of them incidentally):

M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlusTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithSkipComments.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartingNewStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineIsWingComment.java
M src/edu/rice/cs/drjava/model/definitions/indent/IndentRuleWithTrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/IndentRuleWithTraceTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartStmtOfBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/IndentRuleQuestion.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartCurrStmtPlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/Indenter.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhrase.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusBackup.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedToken.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelComment.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/AbstractReducedModel.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/InsideDoubleQuote.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/InsideSingleQuote.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/InsideLineComment.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/InsideBlockComment.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/Free.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceReductionTestCase.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelState.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfo.java
M src/edu/rice/cs/drjava/model/definitions/IndentTest.java
M src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.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/repl/RMIInteractionsModel.java
M src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
M src/edu/rice/cs/drjava/model/Query.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/DummyOpenDefDoc.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/model/OpenDefinitionsDocument.java
M src/edu/rice/cs/drjava/config/PropertyMaps.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/HelpFrame.java
M src/edu/rice/cs/drjava/ui/HTMLFrame.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java
M src/edu/rice/cs/util/JVMProcessCreator.java
M src/edu/rice/cs/util/ExitingNotAllowedException.java

After finishing the separation of the maximum heap size argument from
the JVM arguments, I implemented the code to detect out of memory
situations in the master and slave JVM. If one of the JVMs runs out of
memory, a dialog is displayed that suggests that the user increases
the respective maximum heap size. This finishes up feature request
[ 1908470 ] Separate Memory Preferences, Better Out of Memory Errors.

I then optimized the creation of the "Auto-Complete" list. It is no
longer necessary to create wrappers around JavaAPIListEntry< instances
because both that class and GotoFileListEntry now share a common
superclass. Toggling the "Java API" switch is a lot faster and uses
less memory now. Even with "Scan Class Files After Every Compile",
which allows auto-completion of inner classes, the function is fast,
at least on local drives.

I also changed three keyboard shortcuts. I added "Shift-Mask-O" for
"Open Folder", and I changed "Revert to Saved" from "Mask-R" to
"Shift-Mask-R" because I accidentally hit "Mask-R" and lost a whole
lot of changes. I also changed the "Are you sure?" dialog for "Revert"
to have "No" as default selection. "Mask-R" is now "Rename".

DrJava now detects OutOfMemoryErrors and VMOutOfMemoryExceptions
inside the slave JVM and suggests to increase the maximum heap
memory. It also detects OutOfMemoryErrors in the main JVM,
initiates garbage collection and attempts to ask the user to
increase the maximum heap size for the main JVM.
Also moved "Save Window Position" and "Reset Window Position"
settings into a sub-pane of "Display" in the "Preferences".

PLT Utilities: Improved debug log init time when logging is not used (the properties plt.debug.log or plt.error.log are not set)