DrJava Legacy SVN Repository

The status of the base-scala in this project got mangled. This commit restores consistency.

The following files were added:

R classes/base-scala
A classes/base-scala/edu
A classes/base-scala/edu/rice
A classes/base-scala/edu/rice/cs
A classes/base-scala/edu/rice/cs/drjava
A classes/base-scala/edu/rice/cs/drjava/model
A classes/base-scala/edu/rice/cs/drjava/model/compiler
A classes/base-scala/edu/rice/cs/drjava/model/compiler/descriptors
AM classes/base-scala/edu/rice/cs/drjava/model/compiler/descriptors/ScalaDescriptor.class
AM classes/base-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.class
AM classes/base-scala/edu/rice/cs/drjava/model/compiler/DrJavaReporter$1.class
AM classes/base-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler$1.class
AM classes/base-scala/edu/rice/cs/drjava/model/compiler/DrJavaReporter.class

This revision reverses some of the changes in the last revision (to eliminate warnings) that broke the intended functionality.

The Following files were modified:

M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModel.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/CompilerErrorPanel.java

Changed matching on multiline output to not put out '|' symbol since it hasn't been working correctly

This revision eliminates all warnings from compiled output. Most of the corrections where minor program modifications. In few cases "SuppressWarnings" annotations were added.
A few important unit tests are still failing like GlobalModelIOTest, GlobalModelOtherTest, and IndentTest. But the program performs well from the command line (even with interactions
history).

The following files were modified;

M drjava/src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M drjava/src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/CompilerErrorPanel.java
M drjava/src/edu/rice/cs/drjava/ui/EditExternalDialog.java
M drjava/src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModel.java
M drjava/src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModelTest.java
M drjava/src/edu/rice/cs/drjava/ui/predictive/PredictiveInputFrame.java
M drjava/src/edu/rice/cs/drjava/ui/NewVersionPopup.java
M drjava/src/edu/rice/cs/drjava/ui/config/ForcedChoiceOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/RegionsListPanel.java
M drjava/src/edu/rice/cs/drjava/ui/FindResultsPanel.java
M drjava/src/edu/rice/cs/drjava/ui/ProjectAdvancedPropertiesFrame.java
M drjava/src/edu/rice/cs/drjava/ui/ClipboardHistoryFrame.java
M drjava/src/edu/rice/cs/util/docnavigation/JListNavigator.java
M drjava/src/edu/rice/cs/util/swing/FontChooser.java
M drjava/src/edu/rice/cs/util/swing/CheckBoxJList.java
M drjava/src/edu/rice/cs/util/swing/ScrollableListDialog.java

This revision limits Scala compiler searching to drjava.jar (which contains the compiler). It also fixes a few of the compiler warning generated by Java 7.

The following files were modified:

A platform/classes/base-scala
A platform/classes/base-scala/edu
A platform/classes/base-scala/edu/rice
A platform/classes/base-scala/edu/rice/cs
A platform/classes/base-scala/edu/rice/cs/drjava
A platform/classes/base-scala/edu/rice/cs/drjava/model
A platform/classes/base-scala/edu/rice/cs/drjava/model/compiler
A platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/descriptors
AM platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/descriptors/ScalaDescriptor.class
AM platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.class
AM platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/DrJavaReporter$1.class
AM platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler$1.class
AM platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/DrJavaReporter.class
M platform/build.xml
M platform/src-scala/edu/rice/cs/drjava/model/compiler/descriptors/ScalaDescriptor.java
_M drjava/lib/scala-swing.jar
_M drjava/lib/scala-dbc.jar
M drjava/lib/platform.jar
_M drjava/lib/scala-library.jar
_M drjava/lib/scala-compiler.jar
M drjava/lib/readme.txt
_M drjava/lib/jline.jar
_M drjava/lib/scalap.jar
M drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M drjava/src/edu/rice/cs/drjava/model/repl/JavaInterpreterTest.java
M drjava/src/edu/rice/cs/drjava/model/repl/InteractionsModelErrorTest.java
M drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java
M drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/AutoCompletePopup.java
M drjava/src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModel.java
M drjava/src/edu/rice/cs/drjava/ui/predictive/PredictiveInputFrame.java
M drjava/src/edu/rice/cs/drjava/ui/config/ConfigDescriptions.java
M drjava/src/edu/rice/cs/drjava/ui/FindResultsPanel.java
M drjava/src/edu/rice/cs/util/docnavigation/JListNavigator.java
M drjava/src/edu/rice/cs/util/swing/CheckBoxJList.java

Added William Forson's scala interactions pane interpreter code to the
model/repl/newjvm package

- Replaced InterpreterJVM.java with William's version in order to use his
custom Interpreter.
- The current interpreter is kludgy but works and this will build.

indentation

This revision adds support for specifying an output directory when compiling in "flat file mode" and some revisions to the
build.xml in the drjava project.

The following files were modified or added:

M drjava/lib/platform.jar
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
AM drjava/src/edu/rice/cs/drjava/model/compiler/ScalaCompilerInterface.java
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
D platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalacCompiler.java
D platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalacCompilerTest.java
M platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java
M platform/build.xml

This commit comments out some debugging code in the file JDKToolsLibrary.java. It also adds the critical Scala distribution jar files to the lib directory so that DrScala can successfully compile.

The following files were added or modified:

AM drjava/lib/scala-dbc.jar
AM drjava/lib/scala-library.jar
AM drjava/lib/scala-compiler.jar
AM drjava/lib/jline.jar
AM drjava/lib/scalap.jar
AM drjava/lib/scala-swing.jar
M drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java

This commit updates platform.jar to be consistent with the platform source code. Debug messages have been removed or suppressed.

The following file was modified:

M drjava/lib/platform.jar