fix mapping of html files to libraries http://code.google.com/p/dart/issues/detail?id=3586

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/model/delta/DeltaProcessor.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 16 matching lines @@
 import com.google.dart.tools.core.internal.util.LibraryReferenceFinder;
 import com.google.dart.tools.core.model.CompilationUnit;
 import com.google.dart.tools.core.model.DartElement;
 import com.google.dart.tools.core.model.DartElementDelta;
 import com.google.dart.tools.core.model.DartLibrary;
 import com.google.dart.tools.core.model.DartModelException;
 import com.google.dart.tools.core.model.DartProject;
 import com.google.dart.tools.core.model.ElementChangedEvent;
 import com.google.dart.tools.core.model.ElementChangedListener;
 import com.google.dart.tools.core.utilities.resource.IFileUtilities;
+import com.google.dart.tools.core.utilities.resource.IResourceUtilities;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ISafeRunnable;
@@ skipping 656 matching lines @@
    */
   private boolean isPrimaryWorkingCopy(DartElement element, int elementType) {
     if (elementType == DartElement.COMPILATION_UNIT) {
       CompilationUnit cu = (CompilationUnit) element;
       return cu.isPrimary() && cu.isWorkingCopy();
     }
     return false;
   }
 
   /**
+   * This method is used by the JDT, it is left here commented out, for possible future work in this
+   * file regarding non-Dart resource change events.
+   * <p>
+   * Generic processing for elements with changed contents:
+   * <ul>
+   * <li>The element is closed such that any subsequent accesses will re-open the element reflecting
+   * its new structure.
+   * <li>An entry is made in the delta reporting a content change (K_CHANGE with F_CONTENT flag
+   * set).
+   * </ul>
+   */
+//  private void nonDartResourcesChanged(DartElementImpl element, IResourceDelta delta)
+//      throws DartModelException {
+//    switch (element.getElementType()) {
+//      case DartElement.DART_PROJECT:
+//        currentDelta().addResourceDelta(delta);
+//        return;
+//    }
+//    DartElementDeltaImpl current = currentDelta();
+//    DartElementDeltaImpl elementDelta = current.find(element);
+//    if (elementDelta == null) {
+//      // don't use find after creating the delta as it can be null (see
+//      // https://bugs.eclipse.org/bugs/show_bug.cgi?id=63434)
+//      elementDelta = current.changed(element, DartElementDelta.F_CONTENT);
+//    }
+//  }
+
+  /**
    * Merges all awaiting deltas, and returns the merged {@link DartElementDelta}.
    */
   private DartElementDelta mergeDeltas(Collection<DartElementDelta> deltas) {
     if (deltas.size() == 0) {
       return null;
     }
     if (deltas.size() == 1) {
       return deltas.iterator().next();
     }
 
@@ skipping 29 matching lines @@
         insertedTree = true;
       }
     }
     if (insertedTree) {
       return rootDelta;
     }
     return null;
   }
 
   /**
-   * This method is used by the JDT, it is left here commented out, for possible future work in this
-   * file regarding non-Dart resource change events.
-   * <p>
-   * Generic processing for elements with changed contents:
-   * <ul>
-   * <li>The element is closed such that any subsequent accesses will re-open the element reflecting
-   * its new structure.
-   * <li>An entry is made in the delta reporting a content change (K_CHANGE with F_CONTENT flag
-   * set).
-   * </ul>
-   */
-//  private void nonDartResourcesChanged(DartElementImpl element, IResourceDelta delta)
-//      throws DartModelException {
-//    switch (element.getElementType()) {
-//      case DartElement.DART_PROJECT:
-//        currentDelta().addResourceDelta(delta);
-//        return;
-//    }
-//    DartElementDeltaImpl current = currentDelta();
-//    DartElementDeltaImpl elementDelta = current.find(element);
-//    if (elementDelta == null) {
-//      // don't use find after creating the delta as it can be null (see
-//      // https://bugs.eclipse.org/bugs/show_bug.cgi?id=63434)
-//      elementDelta = current.changed(element, DartElementDelta.F_CONTENT);
-//    }
-//  }
-
-  /**
    * Notifies the list of {@link ElementChangedListener}s. The list of listeners is passed from
    * {@link DeltaProcessingState}.
    * 
    * @see DeltaProcessingState#elementChangedListeners
    * @see DeltaProcessingState#elementChangedListenerMasks
    * @see DeltaProcessingState#elementChangedListenerCount
    */
   private void notifyListeners(DartElementDelta deltaToNotify, int eventType,
       ElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
     final ElementChangedEvent elementChangeEvent = new ElementChangedEvent(deltaToNotify, eventType);
@@ skipping 317 matching lines @@
         return true;
     }
     return true;
   }
 
   private boolean updateHtmlMapping(IResource htmlFile) {
     try {
       List<String> libraryNames = LibraryReferenceFinder.findInHTML(IFileUtilities.getContents((IFile) htmlFile));
 
       if (!libraryNames.isEmpty()) {
+        List<String> libraryPaths = IResourceUtilities.getResolvedFilePaths(htmlFile, libraryNames);
         String key = htmlFile.getLocation().toPortableString();
-        DartCore.create(htmlFile.getProject()).updateHtmlMapping(key, libraryNames, true);
+        DartCore.create(htmlFile.getProject()).updateHtmlMapping(key, libraryPaths, true);
         return true;
       }
     } catch (DartModelException e) {
       DartCore.logError(e);
       resetThisProjectCache((DartProjectImpl) DartCore.create(htmlFile.getProject()));
     } catch (Exception e) {
       DartCore.logError(e);
     }
     return false;
   }
 
 }