Step back and remove more getNode() invocations

compiler/java/com/google/dart/compiler/LibraryDepsVisitor.java

Index: compiler/java/com/google/dart/compiler/LibraryDepsVisitor.java
diff --git a/compiler/java/com/google/dart/compiler/LibraryDepsVisitor.java b/compiler/java/com/google/dart/compiler/LibraryDepsVisitor.java
index da143a640fba8cee80ec216e6384e99a60c479c4..4b68df49a3838f4e8e878255f3b2f6986be430ac 100644
--- a/compiler/java/com/google/dart/compiler/LibraryDepsVisitor.java
+++ b/compiler/java/com/google/dart/compiler/LibraryDepsVisitor.java
@@ -3,17 +3,15 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.google.dart.compiler;
 
+import com.google.dart.compiler.ast.ASTVisitor;
 import com.google.dart.compiler.ast.DartClass;
 import com.google.dart.compiler.ast.DartIdentifier;
-import com.google.dart.compiler.ast.DartNode;
-import com.google.dart.compiler.ast.ASTVisitor;
 import com.google.dart.compiler.ast.DartParameterizedTypeNode;
 import com.google.dart.compiler.ast.DartPropertyAccess;
 import com.google.dart.compiler.ast.DartTypeNode;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.compiler.resolver.Element;
 import com.google.dart.compiler.resolver.ElementKind;
-import com.google.dart.compiler.resolver.EnclosingElement;
 import com.google.dart.compiler.type.InterfaceType;
 import com.google.dart.compiler.type.Type;
 import com.google.dart.compiler.type.TypeKind;
@@ -47,7 +45,7 @@ public class LibraryDepsVisitor extends ASTVisitor<Void> {
     switch (kind) {
       case FIELD:
       case METHOD: {
-        EnclosingElement enclosing = target.getEnclosingElement();
+        Element enclosing = target.getEnclosingElement();

[zundel, 2012/03/12 19:42:31]

Why the removal of EnclosingElement everywhere?  You have removed many
references to it but it still exists in the class hierarchy.  Part of the JDK6
bug?

[scheglov, 2012/03/13 00:42:25]

Because I've tried to make "enclosingElement" just "parentElement".
For example for VariableElement the MethodElement is "enclosing", but are we
going to track all local variables which exist in method and return them from
getMembers()?

Hm...
Looks that you are right, we can make getEnclosingElement() always return
EnclosingElement.
I will fix this.

         addHoleIfSuper(node, enclosing);
         if (enclosing.getKind().equals(ElementKind.LIBRARY)) {
           addElementDependency(target);
@@ -80,13 +78,12 @@ public class LibraryDepsVisitor extends ASTVisitor<Void> {
       DartIdentifier qualifier = (DartIdentifier) node.getQualifier();
       Element target = qualifier.getElement();
       if (target != null && target.getKind() == ElementKind.LIBRARY) {
-        // Handle library prefixes normally (the prefix part of the qualifier
-        // doesn't contain any resolvable library source info)
+        // Handle library prefixes normally.
+        // The prefix part of the qualifier doesn't contain any resolvable library source info.
         return super.visitPropertyAccess(node);
       }
     }
-    // Skip rhs of property accesses, so that all identifiers we visit will be 
-    // unqualified.
+    // Skip rhs of property accesses, so that all identifiers we visit will be unqualified.
     return node.getQualifier().accept(this);
   }
 
@@ -133,13 +130,14 @@ public class LibraryDepsVisitor extends ASTVisitor<Void> {
   /**
    * Adds a direct dependency on the unit providing given {@link Element}.
    */
-  private void addElementDependency(Element elem) {
-    DartNode node = elem.getNode();
-    if (node != null) {
-      DartSource unitSource = (DartSource) node.getSourceInfo().getSource();
-      URI libUri = unitSource.getLibrary().getUri();
+  private void addElementDependency(Element element) {
+    DartSource elementSource = (DartSource) element.getSourceInfo().getSource();
+    if (elementSource != null) {
+      URI libUri = elementSource.getLibrary().getUri();
       LibraryDeps.Dependency dep =
-          new LibraryDeps.Dependency(libUri, unitSource.getName(), unitSource.getLastModified());
+          new LibraryDeps.Dependency(libUri,
+              elementSource.getName(),
+              elementSource.getLastModified());
       source.addDep(dep);
     }
   }