Commit 098be4c
rcartwright
This revision adds many assert statements to the core methods in AbstractDJDocument, its descendants, and clients. It also streamlines the logic of some methods in AbstractDJDocument and reduces the recursive locking in the core methods of AbstractDJDocument. This process is far from complete. I am trying to introduce the convention that methods with locking preconditions (e.g. assume the this holds a read lock) begin with the '_' character. In many cases, there is an analogous method that includes the presumed locking operations and it has the same name except for omitting the leading '_' character.
The following files were modified:
M testFiles/drjava.basic.config
M src/edu/rice/cs/drjava/IndentFiles.java
M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M src/edu/rice/cs/drjava/model/debug/jpda/JPDABreakpoint.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsComment.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsCommentTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInPrevStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultilinePreserve.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultilinePreserveTest.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/QuestionCurrLineStartsWithSkipCommentsTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartingNewStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartingNewStmtTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineEmptyOrEnterPressTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineEmptyOrEnterPress.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsJavaDocWithText.java
M src/edu/rice/cs/drjava/model/definitions/indent/IndentRuleAction.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsWithTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionPrevLineStartsWith.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlusTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineIsWingCommentTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineIsWingComment.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsParenOrBracket.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsParenOrBracketTest.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/QuestionStartAfterOpenBraceTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartAfterOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionInsideCommentTest.java
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/ActionStartStmtOfBracePlusTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineEmpty.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/QuestionHasCharPrecedingOpenBraceTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartCurrStmtPlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlus.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInStmtTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/Indenter.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWith.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionCurrLineStartsWithTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhrase.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhraseTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionLineContainsTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurlyTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionBraceIsCurly.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionDoNothingTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultiline.java
M src/edu/rice/cs/drjava/model/definitions/indent/IndentRulesTestCase.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/indent/ActionStartPrevLinePlusBackupTest.java
M src/edu/rice/cs/drjava/model/definitions/ColoringGlyphPainter.java
M src/edu/rice/cs/drjava/model/definitions/ColoringView.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/SingleQuoteTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/Stutter.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/BackSlashTest.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/BraceTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelDeleteTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/MixedQuoteTest.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/definitions/reducedmodel/ReducedModelTest.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/definitions/IndentHelperTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsDJDocument.java
M src/edu/rice/cs/drjava/model/ConcreteRegionManager.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/DefaultLightWeightParsingControl.java
M src/edu/rice/cs/drjava/model/OpenDefinitionsDocument.java
M src/edu/rice/cs/drjava/model/DJDocument.java
M src/edu/rice/cs/drjava/config/OptionConstants.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/FindReplacePanel.java
M src/edu/rice/cs/drjava/ui/InteractionsController.java
M src/edu/rice/cs/drjava/ui/JUnitPanel.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/text/ReadersWritersLocking.java
M src/edu/rice/cs/util/swing/DocumentOutputStream.java
git-svn-id: file:///tmp/test-svn/trunk@4519 fe72c1cf-3628-48e9-8b72-1c46755d3cff1 parent ba2b5ff commit 098be4c
File tree
98 files changed
+2798
-2571
lines changed- drjava
- src/edu/rice/cs
- drjava
- config
- model
- debug/jpda
- definitions
- indent
- reducedmodel
- repl
- ui
- util
- swing
- text
- testFiles
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
98 files changed
+2798
-2571
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
118 | 122 | | |
119 | 123 | | |
120 | 124 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
961 | 961 | | |
962 | 962 | | |
963 | 963 | | |
964 | | - | |
965 | | - | |
| 964 | + | |
966 | 965 | | |
967 | 966 | | |
968 | | - | |
969 | | - | |
| 967 | + | |
970 | 968 | | |
971 | 969 | | |
972 | | - | |
973 | | - | |
| 970 | + | |
974 | 971 | | |
975 | 972 | | |
976 | 973 | | |
| |||
0 commit comments