DrJava Legacy SVN Repository

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

Changed the survey code to use the script: http://www.drjava.org/submit-usage.php?os.version=X&os.name=Y&java.vendor=Z&java.version=W
The current statistics can be dumped to an tab-delimited, excel-readable spreadsheet visible at: http://www.drjava.org/dump-usage.php

This commit adds a date field to the information passed in
the DrJava survey.

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

This commit fixes a problem with the previous commit and prevents the
"Send System Information to DrJava Developers" and "Check for New
Version" dialogs from appearing automatically during test mode.

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

This revision adds a dialog that asks the user if DrJava maysend
anonymous system information to the DrJava developers.

Every three months, DrJava will automatically ask this question when
DrJava is started, unless the "Never ask me again" checkbox is
checked. The user can also participate in the survey voluntarily, but
the results are only sent in if either three months have passed, or if
the configuration has changed.

The information gets written into a plain-text file at
http://drjava.concutest.org/cgi-bin/os-and-java-info.txt

M src/edu/rice/cs/drjava/config/OptionConstants.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
A src/edu/rice/cs/drjava/ui/DrJavaSurveyPopup.java
M src/edu/rice/cs/drjava/ui/NewVersionPopup.java

Fixes the bug
[ 1992497 ] Folders and Bins Cannot Be Selected
http://sourceforge.net/tracker/index.php?func=detail&aid=1992497&group_id=44253&atid=438935

Folders and bins now can be selected. If a folder is closed, the
selection in the navigator is moved to the document shown in the
Definitions Pane, thus making sure that something is selected in
the navigator, and that the selection is visible and not in a
collapsed subtree.

M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/util/docnavigation/JTreeSortNavigator.java

Made piping between processes much more robust.
Added scroll pane to "Insert Variable" dialog for long
property descriptions.
Fixed bug in StringOps.commandLineToLists(): Did not
take care of escaped space properly.

M src/edu/rice/cs/drjava/config/DrJavaPropertySetup.java
M src/edu/rice/cs/drjava/ui/ExternalProcessPanel.java
M src/edu/rice/cs/drjava/ui/InsertVariableDialog.java
M src/edu/rice/cs/util/StreamRedirectThread.java
M src/edu/rice/cs/util/ProcessChain.java
M src/edu/rice/cs/util/StringOps.java
M src/edu/rice/cs/util/GeneralProcessCreator.java
M src/edu/rice/cs/util/ProcessSequence.java

Fixed two bugs in ConcreteRegionManager: When looking for a region,
the next region above the region sought was always returned; and
listeners for adding and removing regions were called even when
the region already existed (and was therefore not added again) or
didn't exist (and therefore could not be removed).
Added unit test for RegionManager (in DocumentRegionTest).
Changed the Utilities.show() dialog used to display debug messages
so it contains scrollbars, and that the text can be selected and
copied.

M src/edu/rice/cs/drjava/model/DocumentRegionTest.java
M src/edu/rice/cs/drjava/model/ConcreteRegionManager.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/ui/DrJavaScrollableDialog.java
M src/edu/rice/cs/util/swing/ScrollableDialog.java
M src/edu/rice/cs/util/swing/Utilities.java

This revision includes some revisions to the operations in
AbstractDJDocument and related classes to make them faster.
Re-indeting a large file used to run almost instantaneously; now it
doesn't and I don't know why. The indenter behaves as if the
cache is involidated between indents.

The followling files were modified.

M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultilinePreserve.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/ActionBracePlusTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.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/ActionStartStmtOfBracePlusTest.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/Indenter.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultiline.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/AbstractReducedModel.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java
M src/edu/rice/cs/drjava/model/definitions/IndentHelperTest.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/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

This revion is a tiny upate that improves some comment formatting and
adds code to ConfigFrame to work around a NullPointerException that
occasionally arises (at line 147 of ConfigFrame.java before this
revision and line 151 after) on the Windows platform.

The following files were modified.

M src/edu/rice/cs/drjava/model/definitions/indent/QuestionStartingNewStmt.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java