DrJava Legacy SVN Repository

This revision simply patches the holes in the previous commit.

The following files were changed:

M src/edu/rice/cs/drjava/model/GlobalModelCompileErrorsTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartStmtOfBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelComment.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfoTest.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/GlobalIndentTest.java
M src/edu/rice/cs/drjava/model/DJDocument.java

This commit resurrects the changes made in revisions 4357 and 4358 with corrections so that the unit tests pass.

The following files were modified:

M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsParenOrBracket.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurly.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfo.java
M src/edu/rice/cs/drjava/model/definitions/IndentTest.java

Added setup and usage description of YourKit
to Developer Docummentation.

M src/developer/supportingTechnology.docbook

Committed new stream tokenizer that balances quotes/braces.
Allowed attributes in variables for external processes.

Many properties still missing; Windows support still lacking.

Rolled back to revision 4356 because 4357 and 4358 broke some of the unit tests that test indenting operations.

The following files were modifed:

M src/edu/rice/cs/drjava/model/GlobalModelCompileErrorsTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsParenOrBracket.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartStmtOfBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurly.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/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfo.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfoTest.java
M src/edu/rice/cs/drjava/model/definitions/IndentTest.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/GlobalIndentTest.java
M src/edu/rice/cs/drjava/model/DJDocument.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java

Yet another tiny revision that revises the names of some fields and methods involving the reduced model.

The following files were changed:

M src/edu/rice/cs/drjava/model/GlobalModelCompileErrorsTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurly.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.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/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/GlobalIndentTest.java
M src/edu/rice/cs/drjava/model/DJDocument.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java

This commit is a very small update to the reduced model; the names of fields in IndentInfo were changed to be more descriptive.

The following files were modified:

M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsParenOrBracket.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartStmtOfBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurly.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/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfoTest.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/AbstractDJDocument.java

The commit represents an incremental step toward streamlining the indenting code in AbstractDJDocument and the reduced model.

The following files were modified:

M src/edu/rice/cs/drjava/model/GlobalModelCompileErrorsTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelComment.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceReduction.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/GlobalModelCompileIOTest.java
M src/edu/rice/cs/drjava/RemoteControlServer.java
M src/edu/rice/cs/drjava/ui/MainFrame.java

Minor fix with empty file lists, made definition of file list
properties more concise.

Refactored the implementation of the query cache in AbstractDJDocument
to use explicit Query objects rather than strings as kwys. This
revision improved the running time on indenting MainFrame to almost
exactlly one minute on a 2Ghz dual core MacBook. This commit also
includes the beginnings of a cleanup of the code in AbstractDJDocument
where there is clearly lots of redundant locking but there evidently
are some paths to query methods that do not pass through indentLines
which creates a WriteLock on the document, so none of that code was
changed at this juncture.

The revision also included eliminating the constants DOCSTART and
ERROR_INDEX in AbstractDJDocument, which were misleading because
the code base breaks if they do not have the values 0 and -1 respectively.

The following files were revised; most revisions were trivial changes
due to DOCSTART/ERROR_INDEX.

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/ActionStartPrevStmtPlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithSkipCommentsTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartingNewStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsJavaDocWithText.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsWith.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionInsideComment.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBraceTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBraceTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhrase.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionLineContains.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultiline.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionFollowedByStar.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusBackup.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelComment.java
A src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceInfo.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfo.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/IndentInfoTest.java
M src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDocumentTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
M src/edu/rice/cs/drjava/model/repl/RMIInteractionsModel.java
A 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/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/InteractionsPane.java
M src/edu/rice/cs/drjava/ui/DefinitionsPane.java
M src/edu/rice/cs/drjava/ui/SimpleInteractionsWindow.java
M src/edu/rice/cs/drjava/ui/ConsoleController.java
M src/edu/rice/cs/drjava/ui/FindReplacePanel.java
M src/edu/rice/cs/drjava/ui/InteractionsController.java
M src/edu/rice/cs/drjava/ui/AbstractConsoleController.java
M src/edu/rice/cs/util/text/ConsoleDocument.java