DrJava Legacy SVN Repository

indenterTest.java is modified.

added some scala grammer test case and deleted some failed java test case

This revision includes code that displays the output directory used by the Scala
compiler in the compiler errors/output pane.

The following files were modified:

M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/CompilerModel.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/CompilerErrorPanel.java

added test cases for multiline expressions (i.e. if/else and for)

This commit reverses the unexplained reversion in commit 5517 which
eliminated the ScalacCompiler path fixes.

The following files were modified

M platform/classes/base-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.class
M platform/src-scala/edu/rice/cs/drjava/model/compiler/ScalaCompiler.java

Corrects syntax errors in last commit.

The following files were changed:

M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M drjava/src/edu/rice/cs/drjava/model/DrJavaFileUtils.java

This revision contains minor refactoring of methods like isSourceFile. The behavior of unit tests appears unchanged. Our unit tests
still need some Scala updating.

The following files were modified:

M drjava/src/edu/rice/cs/drjava/model/DummyOpenDefDoc.java
M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M drjava/src/edu/rice/cs/drjava/model/DrJavaFileUtils.java
M drjava/src/edu/rice/cs/drjava/model/OpenDefinitionsDocument.java
M drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java
M drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M drjava/src/edu/rice/cs/drjava/model/definitions/reducedmodel/ReducedModelState.java
M drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java

This revision finally passes the class path and build directory for a
project to the Scala compiler. BUT it fails if any of the segment
names in the fully qualified build directory contain spaces. The
classpath may be similarly restricted. We should overcome this
limitation if possible; it depends on what quoting conventions the
Scala compiler recognizes. If possible, I would prefer to pass
compiler arguments programmatically rather than as platform dependent
strings.

In refactoring to get package names to be correctly stored in project
files, I may have made too many changes. But the caching policy for
_packageName in the various document objects (OpenDefinitionsDocument,
DefinitionsDocument) is not clearly spelled out in the code
documentation. I would prefer a simply lazy field (which can be
explicitly updated) that is not intialized until it is demanded.
Ironically, Scala directly supports this idiom.

The following files were modified:

M drjava/lib/platform.jar
M drjava/src/edu/rice/cs/drjava/model/GlobalModelIOTest.java
M drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java

Only cosmetic changes.

The following file was modified.

M plt/src/edu/rice/cs/plt/concurrent/CompletionMonitor.java

This commit includes additional setting for the Scala compiler in the Scala compiler adapter

The following file was modified:

M ScalaCompiler.java

This revision disables much of the code supporting Java language levels. It also replaces a detailed Java parse to
determine the package name for a class by a shallow lexing scan that looks for the first package statement. The latter
scan works for Scala files provides they only contain code belong to a single package.

The following files were modified, added, or deleted:

M drjava/src/edu/rice/cs/drjava/model/DummyGlobalModel.java
M drjava/src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java
M drjava/src/edu/rice/cs/drjava/model/repl/DefaultInteractionsModel.java
M drjava/src/edu/rice/cs/drjava/model/debug/jpda/JPDABreakpoint.java
M drjava/src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
M drjava/src/edu/rice/cs/drjava/model/debug/jpda/PendingRequestManager.java
M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
D drjava/src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java
M drjava/src/edu/rice/cs/drjava/model/compiler/CompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/CompilerErrorModel.java
M drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
AM drjava/src/edu/rice/cs/drjava/model/definitions/PackageLexer.java
AM drjava/src/edu/rice/cs/drjava/model/definitions/PackageLexerTest.java
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java
M drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestManager.java
M drjava/src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
M drjava/src/edu/rice/cs/drjava/model/DrJavaFileUtils.java
M drjava/src/edu/rice/cs/drjava/model/GlobalModel.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/NewJavaClassDialog.java
M drjava/src/edu/rice/cs/drjava/ui/JavaSourceFilter.java
M drjava/src/edu/rice/cs/drjava/ui/SmartSourceFilter.java