Menu

Commit [r4354]  Maximize  Restore  History

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

rcartwright 2008-02-22

1 2 > >> (Page 1 of 2)
changed /trunk/drjava/src/edu/rice/cs/drjava/model/AbstractDJDocument.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/DJDocument.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java
added /trunk/drjava/src/edu/rice/cs/drjava/model/Query.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlus.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusBackup.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultiline.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlus.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithSkipCommentsTest.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInPrevStmt.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInStmt.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionFollowedByStar.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBraceTest.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionInsideComment.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionLineContains.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhrase.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsComment.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsJavaDocWithText.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsWith.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
changed /trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBraceTest.java
/trunk/drjava/src/edu/rice/cs/drjava/model/AbstractDJDocument.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/DJDocument.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/Query.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlus.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusBackup.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultiline.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlus.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithSkipCommentsTest.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInPrevStmt.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInStmt.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionFollowedByStar.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionHasCharPrecedingOpenBraceTest.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionInsideComment.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionLineContains.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhrase.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsComment.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsJavaDocWithText.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsWith.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java Diff Switch to side-by-side view
Loading...
/trunk/drjava/src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBraceTest.java Diff Switch to side-by-side view
Loading...
1 2 > >> (Page 1 of 2)
MongoDB Logo MongoDB