DrJava Legacy SVN Repository

$ 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

This revision cleans up the formatting of many files, particularly
with regard to line length. Many files had lines over 150 characters
long.

It also moves JExprParser.NO_SOURCE_INFO to SourceInfo.NO_INFO where
it belongs. The name NO_INFO was chosen because it is shorter and
equally descriptive in it new context.

The following files were modified:

M src/edu/rice/cs/javalanglevels/PrimitiveData.java
M src/edu/rice/cs/javalanglevels/TypeChecker.java
M src/edu/rice/cs/javalanglevels/ArrayData.java
M src/edu/rice/cs/javalanglevels/Data.java
M src/edu/rice/cs/javalanglevels/MethodData.java
M src/edu/rice/cs/javalanglevels/LValueTypeChecker.java
M src/edu/rice/cs/javalanglevels/VariableData.java
M src/edu/rice/cs/javalanglevels/BodyBodyFullJavaVisitor.java
M src/edu/rice/cs/javalanglevels/BodyBodyAdvancedVisitor.java
M src/edu/rice/cs/javalanglevels/InterfaceBodyFullJavaVisitor.java
M src/edu/rice/cs/javalanglevels/InterfaceBodyAdvancedVisitor.java
M src/edu/rice/cs/javalanglevels/BodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/ElementaryVisitor.java
M src/edu/rice/cs/javalanglevels/TryCatchBodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/ClassBodyFullJavaVisitor.java
M src/edu/rice/cs/javalanglevels/ClassBodyAdvancedVisitor.java
M src/edu/rice/cs/javalanglevels/IntermediateVisitor.java
M src/edu/rice/cs/javalanglevels/SymbolData.java
M src/edu/rice/cs/javalanglevels/Augmentor.java
M src/edu/rice/cs/javalanglevels/Bob.java
M src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java
M src/edu/rice/cs/javalanglevels/InterfaceBodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/LValueWithValueTypeChecker.java
M src/edu/rice/cs/javalanglevels/VoidMethodsNotAllowedClassBodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/ClassBodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/jexpr.jj
M src/edu/rice/cs/javalanglevels/SourceInfo.java
M src/edu/rice/cs/javalanglevels/BodyBodyElementaryVisitor.java
M src/edu/rice/cs/javalanglevels/FullJavaVisitor.java
M src/edu/rice/cs/javalanglevels/AdvancedVisitor.java
M src/edu/rice/cs/javalanglevels/ExpressionTypeChecker.java
M src/edu/rice/cs/javalanglevels/BodyBodyIntermediateVisitor.java
M src/edu/rice/cs/javalanglevels/InterfaceBodyIntermediateVisitor.java
M src/edu/rice/cs/javalanglevels/ClassBodyElementaryVisitor.java
M src/edu/rice/cs/javalanglevels/ConstructorBodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/LanguageLevelVisitor.java
M src/edu/rice/cs/javalanglevels/JExpressionIFPrunableDepthFirstVisitor.java
M src/edu/rice/cs/javalanglevels/ClassBodyIntermediateVisitor.java

$ svn merge --dry-run https://drjava.svn.sourceforge.net/svnroot/drjava/trunk/drjava
--- Merging r5020 through r5021 into '.':
U src/edu/rice/cs/drjava/model/repl/InteractionsModel.java

Attempt to fix the frequent failure: GlobalModelOtherTest.testExitInteractions.

% svn merge --dry-run https://drjava.svn.sourceforge.net/svnroot/drjava/trunk/drjava .
--- Merging r5013 through r5019 into '.':

_M .
M lib/javalanglevels-base.jar
M src/edu/rice/cs/drjava/DrJavaRoot.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/DJError.java
M src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevLinePlusMultilinePreserve.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/DefinitionsEditorKit.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/compiler/CompilerInterface.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/RemoteControlServer.java
M src/edu/rice/cs/drjava/config/ConfigOptionListeners.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/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/predictive/PredictiveInputFrame.java
M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M src/edu/rice/cs/drjava/ui/config/ConfigPanel.java
M src/edu/rice/cs/drjava/ui/config/VectorOptionComponent.java
M src/edu/rice/cs/drjava/ui/ProjectMenuTest.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
M src/edu/rice/cs/drjava/ui/RecentDocFrame.java
M src/edu/rice/cs/drjava/ui/RegionsListPanel.java
M src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java
M src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
M src/edu/rice/cs/drjava/ui/LessPanel.java
M src/edu/rice/cs/util/ProcessChain.java
M src/edu/rice/cs/util/XMLConfig.java
M src/edu/rice/cs/util/StringOps.java
M src/edu/rice/cs/util/ProcessSequence.java
M src/edu/rice/cs/util/BalancingStreamTokenizer.java

Another fix for NullFiles. FileOps.NullFile and NullFile should
be merged.

M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java

Merging drjava-concjunit branch back into trunk.

Changes:

- Moved splash screen and Compiz warning into DrJavaRoot. This makes
sure that the splash screen stays until the program is ready, even on
slow machines.

- Added ConcJUnit testing. To use it, set the -Duse-concjunit=true
parameter:

ant -Duse-concjunit=true test

- Added _NOJOIN to some methods that have threads that do not end and
cannot be joined as of right now. Tests pass without failures or
errors now.

Moved splash screen and Compiz warning into DrJavaRoot. This makes
sure that the splash screen stays until the program is ready, even on
slow machines.