DrJava Legacy SVN Repository

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

Changed keyboard shortcut for Debug mode to MASK + D, instead of just
D.

Added DrJavaProperties and PropertyMaps instead of a Map of
Properties. These DrJavaProperties can be lazy and delay
computationally intensive tasks like that of finding all compiled
class files until actually necessary. In the "Preview", they may
display stale values.

Two basic categories existed before, "Java" with the
System.getProperties, and "Config" with the values of the DrJava
configuration. The "Config" category was previously named "DrJava",
but I thought "Config" was a better name. All the entries in "Config"
start with "config.". The entries in "Java" have the names as
specified by Sun.

A new category has been added, "DrJava", with just a few sample
variables. One of them is "drjava.current.time.millis", which contains
the current time in milliseconds since the beginning of the epoche --
useless, but a good first test.

"drjava.current.file" contains the currently open document as an
absolute path.

"drjava.all.files" contains all open files, separated by
File.pathSeparator. "drjava.project.files", "drjava.included.files"
and "drjava.external.files" do the same for project files, external
files that are saved with the project, and files that are open but not
part of the project.

The same "drjava.*.files" properties exist as "drjava.*.files.spaces",
but here, a space is used to separate the files.

Properties can listen to each other to find out when their values have
been invalidated. There is a debug mechanism in place that prevents
infinite loops.

These are only some very basic sample properties, and we need lots
more, and we need to make sure that we invalidate the values of the
properties in all the right places, but it's a good start.

On a Linux system, for example, try opening a project and then run an
external process with the command line:

tar cfvz test.tar.gz ${drjava.all.files.spaces}

It will create a tar file with all the source files currently open.

Not bad, eh? Please help me figure out what other properties are
needed, and how we can easily make them relative to other directories,
etc.

This is a massive commit, with far-reaching changes. Please
update your working copy of DrJava to the newest revision and
test the changes, the new features, and also the old ones to
make sure I haven't broken anything.

Thanks!

M src/edu/rice/cs/drjava/config/OptionConstants.java
A src/edu/rice/cs/drjava/config/DrJavaProperty.java
A src/edu/rice/cs/drjava/config/JavaSystemProperty.java
A src/edu/rice/cs/drjava/config/PropertyMaps.java
A src/edu/rice/cs/drjava/config/ConfigProperty.java
A src/edu/rice/cs/drjava/config/EagerProperty.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/InsertVariableDialog.java
M src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java
M src/edu/rice/cs/util/JVMProcessCreator.java
M src/edu/rice/cs/util/StringOps.java
M src/edu/rice/cs/util/StringOpsTest.java
M src/edu/rice/cs/util/ProcessCreator.java

Show an hourglass cursor before indenting.

Added dialog to edit external processes (change command line,
rename, working directory; move up or down; remove).
Restructured the Tools menu to make it shorter.
Improved "modal"-ness of dialogs.

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/EditExternalDialog.java
M src/edu/rice/cs/drjava/ui/JarOptionsDialog.java
M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M src/edu/rice/cs/drjava/ui/InsertVariableDialog.java
M src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java

Refactored the query cache for AbstractDJDocument to spped up block indenting. Indenting Mainframe.java now takes a little over a minute on a 2Ghz Core Duo MacBook. The following files were modified:

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/ReducedModelControl.java
M src/edu/rice/cs/drjava/model/repl/History.java
M src/edu/rice/cs/drjava/model/repl/DefaultInteractionsModel.java
M src/edu/rice/cs/drjava/model/AbstractDJDocument.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/DefinitionsPane.java
M src/edu/rice/cs/util/text/ConsoleDocumentInterface.java
M src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java