Skip to content

Commit f8975f6

Browse files
author
dlsmith
committed
Replaced version Strings in Language Levels with JavaVersion objects
git-svn-id: file:///tmp/test-svn/trunk@4136 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 9549518 commit f8975f6

22 files changed

+317
-297
lines changed

‎javalanglevels/lib/readme.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ bcel-5.1-pruned.jar: BCEL 5.1 with the following unneeded class files removed (t
2828
automatically compile BCEL files when needed, and ignore them otherwise.
2929

3030
retroweaver-rt-1.2.3.jar: Retroweaver 1.2.3
31+
plt.jar: plt-20070207-2208
3132
buildlib/ant-contrib.jar: ANT Contrib 1.0b2
3233
buildlib/astgen.jar: astgen-20060227-1521
3334
buildlib/cenquatasks.jar: Distributed with Clover 1.3.9

‎javalanglevels/src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import junit.framework.TestCase;
5050
import java.util.*;
5151
import java.io.*;
52+
import edu.rice.cs.plt.reflect.JavaVersion;
5253

5354
/**
5455
* This is a high-level test to make sure that taking an Advanced Level file from
@@ -82,7 +83,7 @@ public boolean accept(File pathName) {
8283
});
8384

8485

85-
LanguageLevelConverter llc = new LanguageLevelConverter("1.5");
86+
LanguageLevelConverter llc = new LanguageLevelConverter(JavaVersion.JAVA_5);
8687
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
8788
result = llc.convert(testFiles);
8889

@@ -190,7 +191,7 @@ public void testPackageError() {
190191
public boolean accept(File pathName) {
191192
return pathName.getAbsolutePath().endsWith(".dj2");
192193
}});
193-
LanguageLevelConverter llc = new LanguageLevelConverter("1.5");
194+
LanguageLevelConverter llc = new LanguageLevelConverter(JavaVersion.JAVA_5);
194195
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
195196
for (int i = 0; i<testFiles.length; i++) {
196197
result = llc.convert(new File[]{testFiles[i]});
@@ -210,7 +211,7 @@ public boolean accept(File pathName) {
210211
return pathName.getAbsolutePath().endsWith(".dj2");
211212
}});
212213

213-
LanguageLevelConverter llc = new LanguageLevelConverter("1.5");
214+
LanguageLevelConverter llc = new LanguageLevelConverter(JavaVersion.JAVA_5);
214215
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
215216
for (int i = 0; i<testFiles.length; i++) {
216217
LanguageLevelVisitor._errorAdded = false;
@@ -231,7 +232,7 @@ public boolean accept(File pathName) {
231232
return pathName.getAbsolutePath().endsWith("SwitchDoesntAssign.dj2");
232233
}});
233234

234-
LanguageLevelConverter llc = new LanguageLevelConverter("1.5");
235+
LanguageLevelConverter llc = new LanguageLevelConverter(JavaVersion.JAVA_5);
235236
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
236237
for (int i = 0; i<testFiles.length; i++) {
237238
result = llc.convert(new File[]{testFiles[i]});
@@ -251,7 +252,7 @@ public void testPackagedOrderMatters() {
251252

252253
System.out.flush();
253254

254-
LanguageLevelConverter llc = new LanguageLevelConverter("1.5");
255+
LanguageLevelConverter llc = new LanguageLevelConverter(JavaVersion.JAVA_5);
255256
Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result;
256257
result = llc.convert(testFiles);
257258

‎javalanglevels/src/edu/rice/cs/javalanglevels/AdvancedVisitor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import edu.rice.cs.javalanglevels.parser.*;
5050
import java.util.*;
5151
import java.io.*;
52+
import edu.rice.cs.plt.reflect.JavaVersion;
5253

5354
import junit.framework.TestCase;
5455

@@ -85,7 +86,7 @@ public AdvancedVisitor(File file, String packageName, LinkedList<String> importe
8586
* @param targetVersion The version of the Java compiler ("1.4", "1.5", etc) that the user is using. Important for doing autoboxing.
8687
8788
*/
88-
public AdvancedVisitor(File file, LinkedList<Pair<String, JExpressionIF>> errors, Symboltable symbolTable, Hashtable<String, Pair<SourceInfo, LanguageLevelVisitor>> continuations, LinkedList<Pair<LanguageLevelVisitor, SourceFile>> visitedFiles, Hashtable<SymbolData, LanguageLevelVisitor> newSDs, String targetVersion) {
89+
public AdvancedVisitor(File file, LinkedList<Pair<String, JExpressionIF>> errors, Symboltable symbolTable, Hashtable<String, Pair<SourceInfo, LanguageLevelVisitor>> continuations, LinkedList<Pair<LanguageLevelVisitor, SourceFile>> visitedFiles, Hashtable<SymbolData, LanguageLevelVisitor> newSDs, JavaVersion targetVersion) {
8990
super(file, "", new LinkedList<String>(), new LinkedList<String>(), new LinkedList<String>(), continuations);
9091
this.targetVersion = targetVersion;
9192
this.errors = errors;
@@ -599,7 +600,7 @@ public void setUp() {
599600
visitedFiles = new LinkedList<Pair<LanguageLevelVisitor, edu.rice.cs.javalanglevels.tree.SourceFile>>();
600601
_hierarchy = new Hashtable<String, TypeDefBase>();
601602
_classesToBeParsed = new Hashtable<String, Pair<TypeDefBase, LanguageLevelVisitor>>();
602-
_av = new AdvancedVisitor(new File(""), errors, symbolTable, continuations, new LinkedList<Pair<LanguageLevelVisitor, edu.rice.cs.javalanglevels.tree.SourceFile>>(), new Hashtable<SymbolData, LanguageLevelVisitor>(), "1.5");
603+
_av = new AdvancedVisitor(new File(""), errors, symbolTable, continuations, new LinkedList<Pair<LanguageLevelVisitor, edu.rice.cs.javalanglevels.tree.SourceFile>>(), new Hashtable<SymbolData, LanguageLevelVisitor>(), JavaVersion.JAVA_5);
603604
_av.continuations = new Hashtable<String, Pair<SourceInfo, LanguageLevelVisitor>>();
604605
_av._resetNonStaticFields();
605606
_av._importedPackages.addFirst("java.lang");

‎javalanglevels/src/edu/rice/cs/javalanglevels/ArrayData.java‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import java.util.*;
5151
import junit.framework.*;
5252
import java.io.File;
53+
import edu.rice.cs.plt.reflect.JavaVersion;
5354

5455
/**
5556
* Represents the data for an array class. There are two states of SymbolData. One is a continuation which
@@ -186,7 +187,7 @@ public int hashCode() {
186187
* -if assignTo is an array, then if this's element type is a primitive assignTo must have the same primitive element type and
187188
* if this's element type is a reference type, this's reference type must be assignable to assignTo's element type.
188189
*/
189-
public boolean isAssignableTo(SymbolData assignTo, String version) {
190+
public boolean isAssignableTo(SymbolData assignTo, JavaVersion version) {
190191
if (assignTo instanceof ArrayData) {
191192
if (this.getElementType().isPrimitiveType()) {
192193
return this.getElementType() == ((ArrayData)assignTo).getElementType();
@@ -209,7 +210,7 @@ else if (((ArrayData)assignTo).getElementType().isPrimitiveType()) {
209210
* - castTo is an interface type that is Serializable or Clonable
210211
* - castTo is an array type then this and castTo must have element types that are either the same primitive type or (both reference types and this's element type must be castable to castTo's element type)
211212
*/
212-
public boolean isCastableTo(SymbolData castTo, String version) {
213+
public boolean isCastableTo(SymbolData castTo, JavaVersion version) {
213214
if (castTo instanceof ArrayData) {
214215
if (this.getElementType().isPrimitiveType()) {
215216
return this.getElementType() == ((ArrayData)castTo).getElementType();
@@ -360,24 +361,24 @@ public void testSetMav() {
360361
public void testIsAssignableTo() {
361362
//if assignTo is a class, it must be java.lang.Object
362363
SymbolData object = llv.symbolTable.get("java.lang.Object");
363-
assertTrue(_ad.isAssignableTo(object, "1.5"));
364-
assertTrue(_ad.isAssignableTo(object, "1.4"));
364+
assertTrue(_ad.isAssignableTo(object, JavaVersion.JAVA_5));
365+
assertTrue(_ad.isAssignableTo(object, JavaVersion.JAVA_1_4));
365366

366367
SymbolData notObject = new SymbolData("somethingRandom");
367-
assertFalse(_ad.isAssignableTo(notObject, "1.5"));
368-
assertFalse(_ad.isAssignableTo(notObject, "1.4"));
368+
assertFalse(_ad.isAssignableTo(notObject, JavaVersion.JAVA_5));
369+
assertFalse(_ad.isAssignableTo(notObject, JavaVersion.JAVA_1_4));
369370

370371
//if assignTo is an interface, then it must be Serializable or Clonable
371372
SymbolData serializable = _ad.getInterfaces().get(0);
372373
SymbolData clonable = _ad.getInterfaces().get(1);
373374
notObject.setInterface(true);
374375

375-
assertTrue(_ad.isAssignableTo(serializable, "1.5"));
376-
assertTrue(_ad.isAssignableTo(serializable, "1.4"));
377-
assertTrue(_ad.isAssignableTo(clonable, "1.5"));
378-
assertTrue(_ad.isAssignableTo(clonable, "1.4"));
379-
assertFalse(_ad.isAssignableTo(notObject, "1.5"));
380-
assertFalse(_ad.isAssignableTo(notObject, "1.4"));
376+
assertTrue(_ad.isAssignableTo(serializable, JavaVersion.JAVA_5));
377+
assertTrue(_ad.isAssignableTo(serializable, JavaVersion.JAVA_1_4));
378+
assertTrue(_ad.isAssignableTo(clonable, JavaVersion.JAVA_5));
379+
assertTrue(_ad.isAssignableTo(clonable, JavaVersion.JAVA_1_4));
380+
assertFalse(_ad.isAssignableTo(notObject, JavaVersion.JAVA_5));
381+
assertFalse(_ad.isAssignableTo(notObject, JavaVersion.JAVA_1_4));
381382

382383
//if array is an array of primatives, then assign to must have primitive types that must match exactly
383384
_ad = new ArrayData(SymbolData.INT_TYPE, llv, si);
@@ -386,14 +387,14 @@ public void testIsAssignableTo() {
386387
ArrayData charArray = new ArrayData(SymbolData.CHAR_TYPE, llv, si);
387388
ArrayData objArray = new ArrayData(object, llv, si);
388389

389-
assertTrue(_ad.isAssignableTo(intArray, "1.5"));
390-
assertTrue(_ad.isAssignableTo(intArray, "1.4"));
391-
assertFalse(_ad.isAssignableTo(charArray, "1.5"));
392-
assertFalse(_ad.isAssignableTo(charArray, "1.4"));
393-
assertFalse(_ad.isAssignableTo(doubleArray, "1.5"));
394-
assertFalse(_ad.isAssignableTo(doubleArray, "1.4"));
395-
assertFalse(_ad.isAssignableTo(objArray, "1.5"));
396-
assertFalse(_ad.isAssignableTo(objArray, "1.4"));
390+
assertTrue(_ad.isAssignableTo(intArray, JavaVersion.JAVA_5));
391+
assertTrue(_ad.isAssignableTo(intArray, JavaVersion.JAVA_1_4));
392+
assertFalse(_ad.isAssignableTo(charArray, JavaVersion.JAVA_5));
393+
assertFalse(_ad.isAssignableTo(charArray, JavaVersion.JAVA_1_4));
394+
assertFalse(_ad.isAssignableTo(doubleArray, JavaVersion.JAVA_5));
395+
assertFalse(_ad.isAssignableTo(doubleArray, JavaVersion.JAVA_1_4));
396+
assertFalse(_ad.isAssignableTo(objArray, JavaVersion.JAVA_5));
397+
assertFalse(_ad.isAssignableTo(objArray, JavaVersion.JAVA_1_4));
397398

398399

399400
//if array is an array of reference types, then reference types must be assignable to element type
@@ -403,36 +404,36 @@ public void testIsAssignableTo() {
403404
notObject.setInterface(false);
404405
ArrayData randomArray = new ArrayData(notObject, llv, si);
405406

406-
assertTrue(_ad.isAssignableTo(objArray, "1.5"));
407-
assertTrue(_ad.isAssignableTo(objArray, "1.4"));
408-
assertTrue(_ad.isAssignableTo(_ad, "1.5"));
409-
assertTrue(_ad.isAssignableTo(_ad, "1.4"));
410-
assertFalse(_ad.isAssignableTo(randomArray, "1.5"));
411-
assertFalse(_ad.isAssignableTo(randomArray, "1.4"));
412-
assertFalse(_ad.isAssignableTo(intArray, "1.5"));
413-
assertFalse(_ad.isAssignableTo(intArray, "1.4"));
407+
assertTrue(_ad.isAssignableTo(objArray, JavaVersion.JAVA_5));
408+
assertTrue(_ad.isAssignableTo(objArray, JavaVersion.JAVA_1_4));
409+
assertTrue(_ad.isAssignableTo(_ad, JavaVersion.JAVA_5));
410+
assertTrue(_ad.isAssignableTo(_ad, JavaVersion.JAVA_1_4));
411+
assertFalse(_ad.isAssignableTo(randomArray, JavaVersion.JAVA_5));
412+
assertFalse(_ad.isAssignableTo(randomArray, JavaVersion.JAVA_1_4));
413+
assertFalse(_ad.isAssignableTo(intArray, JavaVersion.JAVA_5));
414+
assertFalse(_ad.isAssignableTo(intArray, JavaVersion.JAVA_1_4));
414415
}
415416

416417

417418
public void testIsCastableTo() {
418419
//if castTo is a class type and Object, should work
419420
SymbolData object = llv.symbolTable.get("java.lang.Object");
420-
assertTrue(_ad.isCastableTo(object, "1.5"));
421-
assertTrue(_ad.isCastableTo(object, "1.4"));
421+
assertTrue(_ad.isCastableTo(object, JavaVersion.JAVA_5));
422+
assertTrue(_ad.isCastableTo(object, JavaVersion.JAVA_1_4));
422423

423424
//if castTo is an interface, then it must be Serializable or Clonable
424425
SymbolData serializable = _ad.getInterfaces().get(0);
425426
SymbolData clonable = _ad.getInterfaces().get(1);
426427

427-
assertTrue(_ad.isAssignableTo(serializable, "1.5"));
428-
assertTrue(_ad.isAssignableTo(serializable, "1.4"));
429-
assertTrue(_ad.isAssignableTo(clonable, "1.5"));
430-
assertTrue(_ad.isAssignableTo(clonable, "1.4"));
428+
assertTrue(_ad.isAssignableTo(serializable, JavaVersion.JAVA_5));
429+
assertTrue(_ad.isAssignableTo(serializable, JavaVersion.JAVA_1_4));
430+
assertTrue(_ad.isAssignableTo(clonable, JavaVersion.JAVA_5));
431+
assertTrue(_ad.isAssignableTo(clonable, JavaVersion.JAVA_1_4));
431432

432433
//anything non-array type should break
433434
SymbolData notObject = new SymbolData("somethingRandom");
434-
assertFalse(_ad.isCastableTo(notObject, "1.5"));
435-
assertFalse(_ad.isCastableTo(notObject, "1.4"));
435+
assertFalse(_ad.isCastableTo(notObject, JavaVersion.JAVA_5));
436+
assertFalse(_ad.isCastableTo(notObject, JavaVersion.JAVA_1_4));
436437

437438

438439

@@ -445,14 +446,14 @@ public void testIsCastableTo() {
445446
ArrayData charArray = new ArrayData(SymbolData.CHAR_TYPE, llv, si);
446447
ArrayData objArray = new ArrayData(object, llv, si);
447448

448-
assertTrue(_ad.isCastableTo(intArray, "1.5"));
449-
assertTrue(_ad.isCastableTo(intArray, "1.4"));
450-
assertFalse(_ad.isCastableTo(charArray, "1.5"));
451-
assertFalse(_ad.isCastableTo(charArray, "1.4"));
452-
assertFalse(_ad.isCastableTo(doubleArray, "1.5"));
453-
assertFalse(_ad.isCastableTo(doubleArray, "1.4"));
454-
assertFalse(_ad.isCastableTo(objArray, "1.5"));
455-
assertFalse(_ad.isCastableTo(objArray, "1.4"));
449+
assertTrue(_ad.isCastableTo(intArray, JavaVersion.JAVA_5));
450+
assertTrue(_ad.isCastableTo(intArray, JavaVersion.JAVA_1_4));
451+
assertFalse(_ad.isCastableTo(charArray, JavaVersion.JAVA_5));
452+
assertFalse(_ad.isCastableTo(charArray, JavaVersion.JAVA_1_4));
453+
assertFalse(_ad.isCastableTo(doubleArray, JavaVersion.JAVA_5));
454+
assertFalse(_ad.isCastableTo(doubleArray, JavaVersion.JAVA_1_4));
455+
assertFalse(_ad.isCastableTo(objArray, JavaVersion.JAVA_5));
456+
assertFalse(_ad.isCastableTo(objArray, JavaVersion.JAVA_1_4));
456457

457458

458459
//if array is an array of reference types, then reference types must be castable to element type
@@ -462,20 +463,20 @@ public void testIsCastableTo() {
462463
notObject.setInterface(false);
463464
ArrayData randomArray = new ArrayData(notObject, llv, si);
464465

465-
assertTrue(_ad.isCastableTo(objArray, "1.5"));
466-
assertTrue(_ad.isCastableTo(objArray, "1.4"));
467-
assertTrue(_ad.isCastableTo(_ad, "1.5"));
468-
assertTrue(_ad.isCastableTo(_ad, "1.4"));
469-
assertFalse(_ad.isCastableTo(randomArray, "1.5"));
470-
assertFalse(_ad.isCastableTo(randomArray, "1.4"));
471-
assertFalse(_ad.isCastableTo(intArray, "1.5"));
472-
assertFalse(_ad.isCastableTo(intArray, "1.4"));
466+
assertTrue(_ad.isCastableTo(objArray, JavaVersion.JAVA_5));
467+
assertTrue(_ad.isCastableTo(objArray, JavaVersion.JAVA_1_4));
468+
assertTrue(_ad.isCastableTo(_ad, JavaVersion.JAVA_5));
469+
assertTrue(_ad.isCastableTo(_ad, JavaVersion.JAVA_1_4));
470+
assertFalse(_ad.isCastableTo(randomArray, JavaVersion.JAVA_5));
471+
assertFalse(_ad.isCastableTo(randomArray, JavaVersion.JAVA_1_4));
472+
assertFalse(_ad.isCastableTo(intArray, JavaVersion.JAVA_5));
473+
assertFalse(_ad.isCastableTo(intArray, JavaVersion.JAVA_1_4));
473474

474475
_ad = new ArrayData(object, llv, si);
475-
assertTrue(_ad.isCastableTo(new ArrayData(integerSd, llv, si), "1.5"));
476-
assertTrue(_ad.isCastableTo(new ArrayData(integerSd, llv, si), "1.4"));
477-
assertFalse(_ad.isCastableTo(new ArrayData(SymbolData.INT_TYPE, llv, si), "1.5"));
478-
assertFalse(_ad.isCastableTo(new ArrayData(SymbolData.INT_TYPE, llv, si), "1.4"));
476+
assertTrue(_ad.isCastableTo(new ArrayData(integerSd, llv, si), JavaVersion.JAVA_5));
477+
assertTrue(_ad.isCastableTo(new ArrayData(integerSd, llv, si), JavaVersion.JAVA_1_4));
478+
assertFalse(_ad.isCastableTo(new ArrayData(SymbolData.INT_TYPE, llv, si), JavaVersion.JAVA_5));
479+
assertFalse(_ad.isCastableTo(new ArrayData(SymbolData.INT_TYPE, llv, si), JavaVersion.JAVA_1_4));
479480
}
480481
}
481482
}

‎javalanglevels/src/edu/rice/cs/javalanglevels/Augmentor.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import java.io.*;
5151
import java.util.*;
5252
import junit.framework.TestCase;
53+
import edu.rice.cs.plt.reflect.JavaVersion;
5354

5455
public class Augmentor extends JExpressionIFDepthFirstVisitor_void {
5556

@@ -72,7 +73,7 @@ public class Augmentor extends JExpressionIFDepthFirstVisitor_void {
7273
static private LanguageLevelVisitor _llv;
7374

7475
/** A string describing the target compiler. Must include "1.5" to use 1.5 extensions in destination file. */
75-
static private String _targetVersion;
76+
static private JavaVersion _targetVersion;
7677

7778
/** If true, generated toString, hashCode, & equals methods should correctly handle arrays & infinitely recursive structures */
7879
static private boolean _safeSupportCode;
@@ -91,7 +92,7 @@ public class Augmentor extends JExpressionIFDepthFirstVisitor_void {
9192
* @param fileOut A BufferedWriter corresponding to the .java file we should write to.
9293
* @param llv The LanguageLevelVisitor that was used to traverse the language level file.
9394
*/
94-
public Augmentor(String targetVersion, boolean safeSupportCode, BufferedReader fileIn, BufferedWriter fileOut, LanguageLevelVisitor llv) {
95+
public Augmentor(JavaVersion targetVersion, boolean safeSupportCode, BufferedReader fileIn, BufferedWriter fileOut, LanguageLevelVisitor llv) {
9596
_fileIn = fileIn;
9697
_fileInLine = 1;
9798
_fileInColumn = 1;
@@ -1537,7 +1538,7 @@ public AugmentorTest(String name) {
15371538

15381539
public void setUp() {
15391540
LanguageLevelVisitor llv = new ElementaryVisitor(_f, new LinkedList<Pair<String, JExpressionIF>>(), _s, new Hashtable<String, Pair<SourceInfo, LanguageLevelVisitor>>(), new LinkedList<Pair<LanguageLevelVisitor, SourceFile>>(), new Hashtable<SymbolData, LanguageLevelVisitor>(), null);
1540-
_a = new Augmentor("", true, null, null, llv);
1541+
_a = new Augmentor(JavaVersion.JAVA_1_4, true, null, null, llv);
15411542
}
15421543

15431544
public void testFormalParameters2TypeDatas() {

‎javalanglevels/src/edu/rice/cs/javalanglevels/Bob.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import edu.rice.cs.javalanglevels.parser.JExprParser;
5050
import java.util.*;
5151
import java.io.File;
52+
import edu.rice.cs.plt.reflect.JavaVersion;
5253

5354
import junit.framework.TestCase;
5455

@@ -595,7 +596,7 @@ public void setUp() {
595596
errors = new LinkedList<Pair<String, JExpressionIF>>();
596597
symbolTable = new Symboltable();
597598
_b = new Bob(null, new File(""), "", new LinkedList<String>(), new LinkedList<String>(), new LinkedList<VariableData>(), new LinkedList<Pair<SymbolData, JExpression>>());
598-
_b._targetVersion = "1.5";
599+
_b._targetVersion = JavaVersion.JAVA_5;
599600
_b._importedPackages.addFirst("java.lang");
600601
_sd1 = new SymbolData("i.like.monkey");
601602
_sd2 = new SymbolData("i.like.giraffe");

‎javalanglevels/src/edu/rice/cs/javalanglevels/BodyTypeChecker.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import edu.rice.cs.javalanglevels.parser.JExprParser;
5050
import java.util.*;
5151
import java.io.*;
52+
import edu.rice.cs.plt.reflect.JavaVersion;
5253

5354
import junit.framework.TestCase;
5455

@@ -1085,7 +1086,7 @@ public void setUp() {
10851086
_bd1.addVars(((MethodData)_bd1).getParams());
10861087
_bd2.addVars(((MethodData)_bd2).getParams());
10871088
_bbtc = new BodyTypeChecker(_bd1, new File(""), "", new LinkedList<String>(), new LinkedList<String>(), new LinkedList<VariableData>(), new LinkedList<Pair<SymbolData,JExpression>>());
1088-
_bbtc._targetVersion = "1.5";
1089+
_bbtc._targetVersion = JavaVersion.JAVA_5;
10891090
_bbtc._importedPackages.addFirst("java.lang");
10901091
}
10911092

0 commit comments

Comments
 (0)