DrJavaAtRice
diff --git a/‎javalanglevels/src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java‎
Lines changed: 15 additions & 1 deletion b/‎javalanglevels/src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎javalanglevels/src/edu/rice/cs/javalanglevels/ArrayData.java‎
Lines changed: 29 additions & 42 deletions b/‎javalanglevels/src/edu/rice/cs/javalanglevels/ArrayData.java‎
Lines changed: 29 additions & 42 deletions
@@ -84,7 +84,21 @@ public boolean accept(File pathName) {
     };
   }
 
-  /** Try some example files and make sure they can be converted without errors and that the resulting conversions are correct. */
+  /** This ensures that setUp() is not failing. */
+  public void testNothing() {
+    LanguageLevelVisitor llv = 
+      new LanguageLevelVisitor(new File(""), 
+                               "",
+                               null,
+                               new LinkedList<String>(), 
+                               new LinkedList<String>(),
+                               new HashSet<String>(), 
+                               new Hashtable<String, Triple<SourceInfo, LanguageLevelVisitor, SymbolData>>(),
+                               new LinkedList<Command>());
+  }
+  
+  /** Try some example files and make sure they can be converted without errors and that the resulting conversions are 
+    * correct. */
   public void testSuccessful() {
 
     _log.log("Running testSuccessful");
 
@@ -54,25 +54,22 @@ public class ArrayData extends SymbolData {
   /**The type of the elements of this array.  For example, int[] has an _elementType of int.*/
   private SymbolData _elementType;
 
-  /**
-   * Creates a new ArrayData corresponding to the elementType sd.
-   * @param sd  The SymbolData element type.
-   * @param llv  The LanguageLevelVisitor who created this ArrayData.
-   * @param si  The SourceInfo corresponding to this ArrayData.
-   */
+  /** Creates a new ArrayData corresponding to the elementType sd.
+    * @param sd   The SymbolData element type; may be a continuation
+    * @param llv  The LanguageLevelVisitor who created this ArrayData.
+    * @param si   The SourceInfo corresponding to this ArrayData.
+    */
   public ArrayData(SymbolData sd, LanguageLevelVisitor llv, SourceInfo si) {
     super(sd.getName() + "[]");
 
     _elementType = sd;
 
     // Arrays only have one field called length, and it is automatically given a value
     addVar(new VariableData("length", 
-                            new ModifiersAndVisibility(SourceInfo.NO_INFO, 
-                                                       new String[] {"public", "final"}),
-                            SymbolData.INT_TYPE, true, this));
-    
+                            new ModifiersAndVisibility(SourceInfo.NO_INFO, new String[] {"public", "final"}),
+                            SymbolData.INT_TYPE, true, this)); 
 
-    //All arrays are a subclass of Object
+    // All arrays are a subclass of Object
     SymbolData object = llv.getSymbolData("java.lang.Object", si);
     setSuperClass(object);
 
@@ -98,16 +95,14 @@ public ArrayData(SymbolData sd, LanguageLevelVisitor llv, SourceInfo si) {
   /** @return the package of the element type*/
   public String getPackage() { return _elementType.getPackage(); }
 
-  /*Set the package of the element type to be the specified package:
-   * @param s  The package to use*/
-  public void setPackage(String s) {
-    _elementType.setPackage(s);
-  }
+  /** Set the package of the element type to be the specified package:
+    * @param s  The package to use*/
+  public void setPackage(String s) { _elementType.setPackage(s); }
 
 
   /* @return the ModifiersAndVisibility of the element type*/
   public ModifiersAndVisibility getMav() {
-    if (_elementType.hasModifier("final")) { return _elementType.getMav(); }
+    if (_elementType.hasModifier("final"))  return _elementType.getMav();
     else {
       String[] elementMavs = _elementType.getMav().getModifiers();
       String[] newMavs = new String[elementMavs.length + 1];
@@ -118,43 +113,33 @@ public ModifiersAndVisibility getMav() {
     }
   }
 
-  /*Set the ModifiersAndVisibility of the element type to the specified value.
-   * @param mv  The ModifiersAndVisibility to use.*/
-  public void setMav(ModifiersAndVisibility mv) {
-    _elementType.setMav(mv);
-  }
+  /** Sets the ModifiersAndVisibility of the element type to the specified value.
+    * @param mv  The ModifiersAndVisibility to use. */
+  public void setMav(ModifiersAndVisibility mv) { _elementType.setMav(mv); }
 
   /** @return the SymbolData element type corresponding to the elements of this array.*/
-  public SymbolData getElementType() {
-    return _elementType;
-  }
+  public SymbolData getElementType() { return _elementType; }
 
-  /**Delegate to the outer data of your element type*/
-  public Data getOuterData() {
-    return _elementType.getOuterData();
-  }
+  /** Delegates to the outer data of your element type*/
+  public Data getOuterData() { return _elementType.getOuterData(); }
 
-  /**
-   * A Noop, because arrays shouldn't have outer data
-   */
+  /** A Noop, because arrays shouldn't have outer data */
   public void setOuterData(Data outerData) {
 //    _elementType.setOuterData(outerData);
   }
-  
-  
+    
   public boolean equals(Object obj) {
-    if (this == obj) {return true;}
+    if (this == obj) return true;
     if (obj == null) return false;
-    if ((obj.getClass() != this.getClass())) { //|| (obj.hashCode() != this.hashCode())) {
-      return false;
-    }
+    if (obj.getClass() != this.getClass()) return false;
+
     ArrayData ad = (ArrayData) obj;    
 
     //For 2 array datas to be equal, all their symbolData fields must be equal, and their element types must be equal
     return super.equals(obj) && getElementType().equals(ad.getElementType());
   }
 
-  /** Provide a hashcode method that distinguishes between array datas based on name */
+  /** Provides a hashcode method that distinguishes between array datas based on name */
   public int hashCode() { return getName().hashCode(); }
 
   /** Returns true only under the following conditions: 
@@ -252,11 +237,13 @@ public static class ArrayDataTest extends TestCase {
 
     public void setUp() {
       llv = new LanguageLevelVisitor(new File(""), 
-                                     "", 
+                                     "",
+                                     null,
                                      new LinkedList<String>(), 
                                      new LinkedList<String>(),
-                                     new LinkedList<String>(), 
-                                     new Hashtable<String, Pair<SourceInfo, LanguageLevelVisitor>>());
+                                     new HashSet<String>(), 
+                                     new Hashtable<String, Triple<SourceInfo, LanguageLevelVisitor, SymbolData>>(),
+                                     new LinkedList<Command>());
 
       LanguageLevelConverter.symbolTable.clear();
       LanguageLevelConverter._newSDs.clear();