DrJava Legacy SVN Repository

DynamicJava: Enums are always treated as static. Capture variable bounds are always normalized. Error messages with lists of types group the capture-variable bound output together in a single side condition.

DynamicJava:
- Revised member lookup, fixing correctness problems in method lookup and making everything a lot more readable.
- Implemented implicit inner constructor calls ("new Inner()", which is interpreted as "Outer.this.new Inner()").
- Fixed name lookup bug (internal exception) when inside of anonymous classes.
- Improved error messages when a lookup result is ambiguous.
- Fixed a bug in the TreeCompiler's handling of inner classes appearing in generic signatures.
- Changed format of capture variables appearing in error messages ("?T1" instead of "?1").

Working on better Creation Context errors.

Updated junit.jar to 20090826 version of ConcJUnit.

Fixed file description for Java files ('DrJava project files' -> 'Java source files').

PLT Utilities: Updated NoDuplicatesIterator and FilteredIterator to support null elements (which were treated before as end-of-list sentinels).

This revision includes some more minor cosmetic changes (performed via
replace all commands), a refactoring of one of the tests in
GlobalModelOtherTest in an attempt to elminate occasional test
failures on some platforms, and an important bug fix. The bug fix
involves updating the cached value of the DefinitionsDocument in
MainFrame for the active document after findAll and replaceAll
commands. On the completion of these commands, no explicit document
switch is performed (which is the only way _currenDefDoc was being
updated), yet a new DefinitionsDocument is created if the active
document is kicked out of the cache.

The following files were modified:

M src/edu/rice/cs/drjava/IndentFiles.java
M src/edu/rice/cs/drjava/DrJava.java
M src/edu/rice/cs/drjava/DrJavaRoot.java
M src/edu/rice/cs/drjava/DrJavaRestart.java
M src/edu/rice/cs/drjava/model/BrowserHistoryManager.java
M src/edu/rice/cs/drjava/model/debug/jpda/DocumentDebugAction.java
M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M src/edu/rice/cs/drjava/model/debug/jpda/DebugTest.java
M src/edu/rice/cs/drjava/model/debug/jpda/EventHandlerThread.java
M src/edu/rice/cs/drjava/model/debug/jpda/PendingRequestManager.java
M src/edu/rice/cs/drjava/model/debug/jpda/DebugContextTest.java
M src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
M src/edu/rice/cs/drjava/model/DummyOpenDefDocTest.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionBracePlusTest.java
M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/Brace.java
M src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelBrace.java
M src/edu/rice/cs/drjava/model/definitions/IndentTest.java
M src/edu/rice/cs/drjava/model/ClipboardHistoryModelTest.java
M src/edu/rice/cs/drjava/model/GlobalEventNotifier.java
M src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java
M src/edu/rice/cs/drjava/model/junit/JUnitErrorModelTest.java
M src/edu/rice/cs/drjava/model/repl/JavaInterpreterTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
M src/edu/rice/cs/drjava/model/repl/newjvm/NewJVMTest.java
M src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java
M src/edu/rice/cs/drjava/model/MultiThreadedTestCase.java
M src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java
M src/edu/rice/cs/drjava/model/FindReplaceMachine.java
M src/edu/rice/cs/drjava/model/ClassAndInterfaceFinderTest.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/GlobalModelOtherTest.java
M src/edu/rice/cs/drjava/RemoteControlServer.java
M src/edu/rice/cs/drjava/config/UnaryOpProperty.java
M src/edu/rice/cs/drjava/config/OptionConstants.java
M src/edu/rice/cs/drjava/config/DrJavaProperty.java
M src/edu/rice/cs/drjava/config/ConfigOptionListeners.java
M src/edu/rice/cs/drjava/config/BinaryOpProperty.java
M src/edu/rice/cs/drjava/config/DrJavaPropertySetupTest.java
M src/edu/rice/cs/drjava/config/DrJavaPropertySetup.java
M src/edu/rice/cs/drjava/config/QuaternaryOpProperty.java
M src/edu/rice/cs/drjava/config/PropertyMaps.java
M src/edu/rice/cs/drjava/config/ConfigProperty.java
M src/edu/rice/cs/drjava/config/TernaryOpProperty.java
M src/edu/rice/cs/drjava/config/VectorOption.java
M src/edu/rice/cs/drjava/config/OptionMapLoader.java
M src/edu/rice/cs/drjava/config/OptionMapLoaderTest.java
M src/edu/rice/cs/drjava/CommandLineTest.java
M src/edu/rice/cs/drjava/project/ProjectFileParser.java
M src/edu/rice/cs/drjava/project/XMLProjectFileParser.java
M src/edu/rice/cs/drjava/project/XMLProjectFileParserTest.java
M src/edu/rice/cs/drjava/project/ProjectTest.java
M src/edu/rice/cs/drjava/project/ProjectFileParserFacade.java
M src/edu/rice/cs/drjava/project/ProjectProfile.java
M src/edu/rice/cs/drjava/RemoteControlClient.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/ExternalProcessPanel.java
M src/edu/rice/cs/drjava/ui/EditExternalDialog.java
M src/edu/rice/cs/drjava/ui/KeyBindingManager.java
M src/edu/rice/cs/drjava/ui/HTMLFrame.java
M src/edu/rice/cs/drjava/ui/JarOptionsDialog.java
M src/edu/rice/cs/drjava/ui/DrJavaSurveyPopup.java
M src/edu/rice/cs/drjava/ui/ErrorPanel.java
M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModelTest.java
M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputFrame.java
M src/edu/rice/cs/drjava/ui/NewVersionPopup.java
M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M src/edu/rice/cs/drjava/ui/config/OptionComponent.java
M src/edu/rice/cs/drjava/ui/ProjectMenuTest.java
M src/edu/rice/cs/drjava/ui/RegionsTreePanel.java
M src/edu/rice/cs/drjava/ui/RegionsListPanel.java
M src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java
M src/edu/rice/cs/drjava/ui/AboutDialog.java
M src/edu/rice/cs/drjava/ui/InteractionsController.java
M src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java
M src/edu/rice/cs/drjava/ui/JUnitPanel.java
M src/edu/rice/cs/drjava/ui/LessPanel.java
M src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java
M src/edu/rice/cs/util/FileOps.java
M src/edu/rice/cs/util/FileOpsTest.java
M src/edu/rice/cs/util/StreamRedirectThread.java
M src/edu/rice/cs/util/swing/DirectorySelectorComponent.java
M src/edu/rice/cs/util/swing/HighlightManager.java
M src/edu/rice/cs/util/swing/FileSelectorComponent.java
M src/edu/rice/cs/util/LogTest.java
M src/edu/rice/cs/util/ProcessChain.java
M src/edu/rice/cs/util/XMLConfig.java
M src/edu/rice/cs/util/XMLConfigTest.java
M src/edu/rice/cs/util/StringOps.java
M src/edu/rice/cs/util/StringOpsTest.java
M src/edu/rice/cs/util/jar/JarCreationTest.java
M src/edu/rice/cs/util/GeneralProcessCreator.java
M src/edu/rice/cs/util/sexp/Tokens.java
M src/edu/rice/cs/util/sexp/SExpParser.java
M src/edu/rice/cs/util/sexp/SExpParserTest.java
M src/edu/rice/cs/util/ProcessSequence.java
M src/edu/rice/cs/util/RunnableEST.java
M src/edu/rice/cs/util/BalancingStreamTokenizer.java
M src/edu/rice/cs/util/BalancingStreamTokenizerTest.java
M src/edu/rice/cs/util/ProcessCreator.java

$ svn merge https://drjava.svn.sourceforge.net/svnroot/drjava/trunk/drjava
--- Merging r5022 through r5025 into '.':
U lib/javalanglevels-base.jar
U src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
U src/edu/rice/cs/drjava/model/SingleDisplayModelTest.java
U src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
U src/edu/rice/cs/drjava/model/compiler/CompilerErrorModel.java
U src/edu/rice/cs/drjava/model/compiler/CompilerErrorModelTest.java
U src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java
U src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
U src/edu/rice/cs/drjava/config/ConfigOptionListeners.java
U src/edu/rice/cs/drjava/ui/MainFrame.java
U src/edu/rice/cs/drjava/ui/ExternalProcessPanel.java
U src/edu/rice/cs/drjava/ui/EditExternalDialog.java
U src/edu/rice/cs/drjava/ui/ErrorPanel.java
U src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModel.java
U src/edu/rice/cs/drjava/ui/InsertVariableDialog.java
U src/edu/rice/cs/drjava/ui/MainFrameTest.java
U src/edu/rice/cs/drjava/ui/RegionsListPanel.java
U build.xml

Fixes unit test failures on Windows and Mac OS:

[junit] Testsuite: edu.rice.cs.drjava.ui.MainFrameTest
[junit] Tests run: 14, Failures: 3, Errors: 0
[junit] Testcase: testGotoFileUnderCursor(edu.rice.cs.drjava.ui.MainFrameTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.addToBrowserHistory(AbstractGlobalModel.java:2476)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.addToBrowserHistory(AbstractGlobalModel.java:2470)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.openFile(AbstractGlobalModel.java:1202)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.getDocumentForFile(AbstractGlobalModel.java:2076)
[junit] at edu.rice.cs.drjava.ui.MainFrameTest.testGotoFileUnderCursor(MainFrameTest.java:813)
[junit]
[junit]
[junit] Testcase: testGotoFileUnderCursorAppendJava(edu.rice.cs.drjava.ui.MainFrameTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.addToBrowserHistory(AbstractGlobalModel.java:2476)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.addToBrowserHistory(AbstractGlobalModel.java:2470)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.openFile(AbstractGlobalModel.java:1202)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.getDocumentForFile(AbstractGlobalModel.java:2076)
[junit] at edu.rice.cs.drjava.ui.MainFrameTest.testGotoFileUnderCursorAppendJava(MainFrameTest.java:880)
[junit]
[junit]
[junit] Testcase: testGotoFileUnderCursorShowDialog(edu.rice.cs.drjava.ui.MainFrameTest): FAILED
[junit] null
[junit] junit.framework.AssertionFailedError
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.addToBrowserHistory(AbstractGlobalModel.java:2476)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.addToBrowserHistory(AbstractGlobalModel.java:2470)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.openFile(AbstractGlobalModel.java:1202)
[junit] at edu.rice.cs.drjava.model.AbstractGlobalModel.getDocumentForFile(AbstractGlobalModel.java:2076)
[junit] at edu.rice.cs.drjava.ui.MainFrameTest.testGotoFileUnderCursorShowDialog(MainFrameTest.java:947)
[junit]
[junit]
[junit] Test edu.rice.cs.drjava.ui.MainFrameTest FAILED

This revision cleans up some glitches in unit tests that showed up on
Linux (Ubuntu 9.04 running Sun Java 6 Update 14. The openFile method
now includes an EventQueue.isDispatchThread() assertion which dictated
revising a few unit tests to run code in the event thread.

The following files were modified:

M lib/javalanglevels-base.jar
M src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M src/edu/rice/cs/drjava/model/SingleDisplayModelTest.java
M src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M src/edu/rice/cs/drjava/model/compiler/CompilerErrorModelTest.java
M src/edu/rice/cs/drjava/model/compiler/CompilerErrorModel.java
M src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/config/ConfigOptionListeners.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/ExternalProcessPanel.java
M src/edu/rice/cs/drjava/ui/EditExternalDialog.java
M src/edu/rice/cs/drjava/ui/ErrorPanel.java
M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModel.java
M src/edu/rice/cs/drjava/ui/InsertVariableDialog.java
M src/edu/rice/cs/drjava/ui/RegionsListPanel.java