Skip to content

Commit a0957e8

Browse files
author
mgricken
committed
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-1c46755d3cff
2 parents 1bfeb43 + a6457aa commit a0957e8

File tree

22 files changed

+329
-271
lines changed

22 files changed

+329
-271
lines changed

drjava/lib/dynamicjava-base.jar

0 Bytes
Binary file not shown.

drjava/lib/javalanglevels-base.jar

27 Bytes
Binary file not shown.

drjava/lib/platform.jar

2.27 KB
Binary file not shown.

drjava/lib/plt.jar

18 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2896,7 +2896,7 @@ public boolean inNewProjectPath(File projRoot) {
28962896
/** @return true if this has a legal source file name (ends in extension ".java", ".dj0", ".dj1", or ".dj2". */
28972897
public boolean isSourceFile() {
28982898
if (isUntitled()) return false; // assert _file != null
2899-
return DrJavaFileUtils.isSourceFile(_file.getName());
2899+
return DrJavaFileUtils.isSourceFile(_file.getName()); // TODO: allow .hj files
29002900
}
29012901

29022902
/** Returns whether this document is currently untitled (indicating whether it has a file yet or not).

drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private void _doCompile(List<OpenDefinitionsDocument> docs) throws IOException {
238238
final ArrayList<File> excludedFiles = new ArrayList<File>();
239239
final ArrayList<DJError> packageErrors = new ArrayList<DJError>();
240240
for (OpenDefinitionsDocument doc : docs) {
241-
if (doc.isSourceFile()) {
241+
if (true) { //if (doc.isSourceFile()) { // TODO: allow .hj files
242242
File f = doc.getFile();
243243
// Check for null in case the file is untitled (not sure this is the correct check)
244244
if (f != null && f != FileOps.NULL_FILE) { filesToCompile.add(f); }

drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ else if (isSwingBugArrayIndexOufOfBoundsExceptionInCharWidth(thrown)) {
139139
* https://sourceforge.net/tracker/?func=detail&atid=438935&aid=2831821&group_id=44253
140140
* @return true if this is the Swing bug */
141141
public static boolean isSwingBugArrayIndexOufOfBoundsExceptionInCharWidth(Throwable thrown) {
142-
// only ignore on Sun JVMs
142+
// only ignore on Sun/Oracle JVMs
143143
if (!edu.rice.cs.plt.reflect.JavaVersion.CURRENT_FULL.vendor().
144144
equals(edu.rice.cs.plt.reflect.JavaVersion.VendorType.SUN)) return false;
145145

dynamicjava/lib/plt.jar

18 Bytes
Binary file not shown.

eclipse/lib/plt.jar

18 Bytes
Binary file not shown.

javalanglevels/lib/plt.jar

18 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)