DrJava Legacy SVN Repository

Created tag drjava-beta-20060610-0349

Fixed Retroweaver error (replaced Arrays.toString with Arrays.asList().toString); commented out broken ToolsJarClassLoaderTest, to be fixed later

Added new general-purpose plt code module

Removing failed attempt at an import (imported to the wrong root)

Added new general-purpose plt code module

This commit refactored AbstractGlobalModel so that the set of
auxiliarly files for a project is stored as part of the project state
(a field of type FileGroupingState) rather than as a separate field of
the model. Only two files were modified:

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

This commit cleans up the behavior CommandLineTest (at the cost of moving MainFrame construction to setUp() from testcase construction), execution logging, the TEST_MODE flag and error reports that the Slave JVM died during setup in unit tests (some of which kill the slave before it has registered). The number of files affected is large (primarilty from cleaning up execution logging) but the number of lines changed is modest. CommandLineTest was problematic because it created many copies of MainFrame (presumably each using a separate class loader) that appeared to interfere with one another when run on PLT lab machines. Now they are created and destroyed serially so that neither they nor the DefaultModels that they create overlap.

The modifed files are:

M src/edu/rice/cs/drjava/DrJavaTestCase.java
M src/edu/rice/cs/drjava/DrJava.java
M src/edu/rice/cs/drjava/model/debug/EventHandlerThread.java
M src/edu/rice/cs/drjava/model/debug/JPDADebugger.java
M src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M src/edu/rice/cs/drjava/model/GlobalModelTestCase.java
M src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java
M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
M src/edu/rice/cs/drjava/model/repl/newjvm/NewJVMTest.java
M src/edu/rice/cs/drjava/model/SingleDisplayModelTest.java
M src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java
M src/edu/rice/cs/drjava/model/compiler/CompilerRegistry.java
M src/edu/rice/cs/drjava/model/compiler/CompilerProxy.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/model/SingleDisplayModel.java
M src/edu/rice/cs/drjava/model/FileGroupingState.java
M src/edu/rice/cs/drjava/config/SavableConfiguration.java
M src/edu/rice/cs/drjava/config/OptionMapLoaderTest.java
M src/edu/rice/cs/drjava/config/OptionMapLoader.java
M src/edu/rice/cs/drjava/CommandLineTest.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/JarOptionsDialog.java
M src/edu/rice/cs/drjava/ui/config/ConfigPanel.java
M src/edu/rice/cs/drjava/ui/config/OptionComponent.java
M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
M src/edu/rice/cs/util/swing/Utilities.java
M src/edu/rice/cs/util/swing/ConfirmCheckBoxDialog.java
M src/edu/rice/cs/util/newjvm/ExecJVMTest.java
D src/edu/rice/cs/util/newjvm/IRemoteClassLoader.java
M src/edu/rice/cs/util/newjvm/SlaveJVMRunner.java
D src/edu/rice/cs/util/newjvm/RemoteClassLoader.java
M src/edu/rice/cs/util/newjvm/AbstractSlaveJVM.java
M src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java
M src/edu/rice/cs/util/newjvm/IntegratedMasterSlaveTest.java
M build.xml

This commit revises the definition of rmi-test-classes in build.xml to be consistent with yesterdays commits revising the RMI code linking the Master and Slave JVMs. The name of the Master class in IntegratedMasterSlaveTest is "IntegratedMasterSlaveTest$TestMasterJVM.class" not "IntegratedMasterSlaveTest$MasterIMpl.class". The latter no longer exists.

The following file was modified:

M build.xml

This commit cleans up the DrJava RMI code (primarily classes
AbstractMasterJVM, AbstractSlaveJVM, and SlaveJVMRunner in
edu.rice.cs.util.newjvm). It eliminates the CustomSystemClassLoader
class entirely and the needless exporting and stubfile passing of an
instance of this class from AbstractMasterJVM to the the Slave JVM
(SlaveJVMRunner and AbstractSlaveJVM classes) since the Slave JVM no
longer uses a remote loader in DrJava. The new version of
AbstractMaster only exports and passes the stubfile for "this" once
for each instance of the class instead of every time invokeSlave is
called. The 3 minute pause in readObject (which I am now firmly
convinced is a serious RMI bug) was occurring so frequently prior to
this change that one unit test run took over 15 minutes (9 1/2 minutes
longer than usual) on a dual core machine because the pause happened
3 times (at 3 minutes 9 seconds each) during the execution of the
suite.

This commit also includes some other minor fixes. The quit command in
AbstractGlobalModel once again uses exit(...) rather than halt(...) unless
the attempt to exit(...) times out. Using halt(...) universally is a BAD
idea because it does not execute exit hooks including RMI cleanup. The
InteractionsModelTest runs about 20 times faster than before because this
commit replaces some idiotic "Thread.sleep(...)" calls for some remote event
to occur by explict wait/notify (with while loops waiting on appropriate
predicates) synchronization. Finally, the commit includes code to support
the latest beta release of Java 6.0 which has significantly different
published and unpublished compiler interfaces than it did in March. The
committed code base nearly passes all unit tests using Java 6.0 but there
is a minor glitch in the semantics of File.deleteOnExit() that we need to
address.

The modified files include:

M src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
M src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java
M src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
M src/edu/rice/cs/drjava/model/compiler/Javac150FromClassPath.java
M src/edu/rice/cs/drjava/model/compiler/CompilerRegistryTest.java
M src/edu/rice/cs/drjava/model/compiler/CompilerRegistry.java
M src/edu/rice/cs/drjava/model/compiler/Javac150FromSetLocation.java
M src/edu/rice/cs/drjava/model/compiler/CompilerProxy.java
M src/edu/rice/cs/drjava/model/compiler/Javac150FromToolsJar.java
M src/edu/rice/cs/drjava/model/compiler/Javac160FromToolsJar.java
M src/edu/rice/cs/drjava/model/compiler/JavacFromSetLocation.java
M src/edu/rice/cs/drjava/model/compiler/JavacFromToolsJar.java
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/project/ProjectTest.java
M src/edu/rice/cs/drjava/ui/ProjectMenuTest.java
M src/edu/rice/cs/util/Log.java
M src/edu/rice/cs/util/newjvm/SlaveJVMRunner.java
M src/edu/rice/cs/util/newjvm/MasterRemote.java
M src/edu/rice/cs/util/newjvm/RemoteClassLoader.java
M src/edu/rice/cs/util/newjvm/AbstractSlaveJVM.java
M src/edu/rice/cs/util/newjvm/AbstractMasterJVM.java
D src/edu/rice/cs/util/newjvm/CustomSystemClassLoader.java
M src/edu/rice/cs/util/newjvm/IntegratedMasterSlaveTest.java

--This line, and those below, will be ignored--

This jar file includes the updated compiler adapter for Java 6.0 that was commited just a moment ago.

Modified files:

M compilers.jar