Commit a0957e8
mgricken
Merged trunk into branch, worked on HJ compiler adapter.
% svn merge --dry-run https://drjava.svn.sourceforge.net/svnroot/drjava/trunk .
--- Merging r5337 through r5345 into '.':
C plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
U plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
C eclipse/lib/plt.jar
U platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$CompilerErrorListener.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$2.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$3.class
C dynamicjava/lib/plt.jar
C drjava/lib/platform.jar
C drjava/lib/javalanglevels-base.jar
C drjava/lib/dynamicjava-base.jar
C drjava/lib/plt.jar
C drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
C drjava/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
U drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
U drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
C javalanglevels/lib/plt.jar
Summary of conflicts:
Text conflicts: 13
Tree conflicts: 1
_M .
M plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
M plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
_M plt/src/edu/rice/cs/plt/collect/MutableRelationTest.java
M eclipse/lib/plt.jar
M platform/src-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.java
M platform/src-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.java
M platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java
M platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$1.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.class
A platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/descriptors
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$2.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1$1.class
M dynamicjava/lib/plt.jar
_M dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ImportContext.java
_M dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ClassChecker.java
M drjava/lib/platform.jar
M drjava/lib/javalanglevels-base.jar
M drjava/lib/dynamicjava-base.jar
M drjava/lib/plt.jar
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
M javalanglevels/lib/plt.jar
M javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java
git-svn-id: file:///tmp/test-svn/branches/drjava-compilers@5346 fe72c1cf-3628-48e9-8b72-1c46755d3cffFile tree
22 files changed
+329
-271
lines changed- drjava
- lib
- src/edu/rice/cs/drjava
- model
- compiler
- ui
- dynamicjava/lib
- eclipse/lib
- javalanglevels
- lib
- src/edu/rice/cs/javalanglevels
- platform
- classes
- base-hj/edu/rice/cs/drjava/model/compiler
- descriptors
- base-nextgen/edu/rice/cs/drjava/model/compiler
- src-hj/edu/rice/cs/drjava/model/compiler
- descriptors
- src-mint/edu/rice/cs/drjava/model/compiler
- plt/src/edu/rice/cs/plt/reflect
22 files changed
+329
-271
lines changedBinary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2896 | 2896 | | |
2897 | 2897 | | |
2898 | 2898 | | |
2899 | | - | |
| 2899 | + | |
2900 | 2900 | | |
2901 | 2901 | | |
2902 | 2902 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
238 | 238 | | |
239 | 239 | | |
240 | 240 | | |
241 | | - | |
| 241 | + | |
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | | - | |
| 142 | + | |
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
| |||
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments