Menu

Legacy SVN Repository Commit Log


Commit Date  
[r4524] by dlsmith

Major update with some backwards-incompatible changes. Major changes include:

- Changed the signature of Predicate, etc., to return a primitive boolean and changed its method name to "contains". (The previous relationship to Lambda<T, Boolean> was rarely useful and forced inefficient boxing.) Added methods for converting from a Predicate to a Lambda.

- Added isStatic() and isEmpty() methods to SizedIterable. Renamed isFixed->hasFixedSize.

- Standardized "asFoo" vs. "makeFoo"/"toFoo" methods in IterUtil and CollectUtil. "as" methods should always cast or create a lazy wrapper; "make"/"to" methods create a separate object. The IterUtil.asList, etc., methods were cleaned up based on this rationale and moved to CollectUtil.

- Major improvements to Relation. Some interface changes; also added Relation3 and Relation4 interfaces. Implemented AbstractRelation to simplify custom implementations. Defined FunctionalRelation, InjectiveRelation, and OneToOneRelation interfaces, with Abstract... and Hash... implementations for each. Added a variety of basic relations: SingletonRelation, CartesianRelation, ComposedRelation, FilteredRelation, DelegatingRelation, ImmutableRelation. Extracted indexing code in HashRelation into a RelationIndex interface and two concrete RelationIndex implementations.

- Misc collect package improvements. Defined PredicateSet and LambdaMap interfaces, so that all implementations here support both interfaces (and PredicateSets are also SizedIterables). Provided simple abstract parent classes for both of these interfaces (AbstractPredicateSet and AbstractKeyBasedMap). Added empty and singleton sets, collections, and maps. Added support for converting iterables to Collections or Sets.

- Modified JavaVersion to support Java 7 and to provide special treatment for unknown future versions.

- Added FilePredicate, which merges the Predicate and FileFilter interfaces. Added support for and/or/negation of FilePredicates in IOUtil. Added FilePredicates used to uniquely identify a file.

- Added EventSequence to help in testing of effects.

Note the following renamings (or similar re-implementations) for backwards compatibility:

- Predicate.value() -> Predicate.contains()
- ComposedMap -> UnionMap; CollectUtil.compose -> CollectUtil.union (ComposedMap still exists, but is something different)
- OneToOneMap -> OneToOneRelation; OneToOneHashMap -> OneToOneHashRelation
- KeyDrivenEntrySet -> AbstractKeBasedMap.entrySet()
- DelegatedSet -> DelegatingSet
- IterUtil.asOption, asPair, etc. -> IterUtil.makeOption, makePair, etc.
- IterUtil.asList, asArrayList, asLinkedList -> CollectUtil.makeArrayList, makeLinkedList
- CollectUtil.asSet -> CollectUtil.makeSet (asSet still exists, doesn't make a copy)
- IterUtil.make(T[]) -> IterUtil.asIterable(T[])
- SizedIterable.isFixed() -> SizedIterable.hasFixedSize()

2008-06-23 23:26:14 Tree
[r4523] by mgricken

Forgot to add a file.

A src/edu/rice/cs/drjava/config/EagerProperty.java
M src/edu/rice/cs/util/GeneralProcessCreator.java

2008-06-22 20:27:12 Tree
[r4522] by mgricken

Added ${drjavajar.file}, ${drjava.file} and ${java.file}
properties. Removed mutation in properties. Removed
separate JVM process creator.

2008-06-22 20:25:34 Tree
[r4521] by rcartwright

This revision refactors the various CaretListeners for document panes.
In the refactored version, there is only one CaretListener on
DefinitionsPane and one on InteractionsPane. The revised code seems
much more responsive for large documents.

The followign files were revised:

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/AbstractReducedModel.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ModelList.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/Brace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/TestDocGetter.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/OpenDefinitionsDocument.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/AbstractDJPane.java

2008-06-21 17:09:07 Tree
[r4520] by rcartwright

This revision cleans up some minor logic errors in AbstractDJDocument
and relating indenting classes. It also eliminates the ugly
getIndentInformation method and IndentInfo classes from the reduced
model in favor of the much cleaner getEnclosingBrace and
getLineEnclosingBrace methods and the BraceInfo class. To support
this transformation, it includes some unit tests for the
getEnclosingBrace and getLineEnclosingBrace methods and the BraceInfo
class.

The following classes were modified, deleted, and added (as marked):

M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInPrevStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlusTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlus.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/QuestionHasCharPrecedingOpenBrace.java
M src/edu/rice/cs/drjava/model/definitions/indent/QuestionExistsCharInStmt.java
M src/edu/rice/cs/drjava/model/definitions/indent/Indenter.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/Gap.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/BraceInfo.java
A src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceInfoTest.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/Brace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceTest.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceReduction.java
D 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/AbstractDJDocument.java
M src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java
M src/edu/rice/cs/drjava/model/DummyGlobalModel.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/model/DJDocument.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/RegionsTreePanel.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
M src/edu/rice/cs/drjava/ui/RegionsListPanel.java

2008-06-17 05:07:27 Tree
[r4519] by 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

2008-06-15 07:14:29 Tree
[r4518] by mgricken

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

2008-06-13 23:38:14 Tree
[r4517] by mgricken

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

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

2008-06-13 11:21:38 Tree
[r4516] by mgricken

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

2008-06-13 06:09:23 Tree
[r4515] by mgricken

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

2008-06-13 02:28:05 Tree
Older >
MongoDB Logo MongoDB