| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/filesview/ResourceLabelProvider.java
|
| ===================================================================
|
| --- editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/filesview/ResourceLabelProvider.java (revision 32236)
|
| +++ editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/filesview/ResourceLabelProvider.java (working copy)
|
| @@ -13,17 +13,12 @@
|
| */
|
| package com.google.dart.tools.ui.internal.filesview;
|
|
|
| -import com.google.dart.engine.element.LibraryElement;
|
| -import com.google.dart.engine.source.SourceKind;
|
| import com.google.dart.tools.core.DartCore;
|
| -import com.google.dart.tools.core.DartCoreDebug;
|
| import com.google.dart.tools.core.analysis.model.AnalysisEvent;
|
| import com.google.dart.tools.core.analysis.model.AnalysisListener;
|
| -import com.google.dart.tools.core.analysis.model.ProjectManager;
|
| import com.google.dart.tools.core.analysis.model.ResolvedEvent;
|
| import com.google.dart.tools.core.analysis.model.ResolvedHtmlEvent;
|
| import com.google.dart.tools.core.internal.builder.AnalysisWorker;
|
| -import com.google.dart.tools.core.utilities.io.FilenameUtils;
|
| import com.google.dart.tools.ui.DartToolsPlugin;
|
|
|
| import org.eclipse.core.filesystem.IFileStore;
|
| @@ -120,12 +115,13 @@
|
| return DartToolsPlugin.getImage(BUILD_FILE_ICON);
|
| }
|
|
|
| - if (DartCoreDebug.EXPERIMENTAL) {
|
| - SourceKind kind = DartCore.getProjectManager().getSourceKind(file);
|
| - if (kind == SourceKind.LIBRARY) {
|
| - return DartToolsPlugin.getImage(LIBRARY_ICON);
|
| - }
|
| - }
|
| + // TODO(scheglov) disabled because even with tasks it causes short, but noticeable UI locks
|
| +// if (DartCoreDebug.EXPERIMENTAL) {
|
| +// SourceKind kind = DartCore.getProjectManager().getSourceKind(file);
|
| +// if (kind == SourceKind.LIBRARY) {
|
| +// return DartToolsPlugin.getImage(LIBRARY_ICON);
|
| +// }
|
| +// }
|
| }
|
|
|
| if (element instanceof IFolder) {
|
| @@ -197,26 +193,27 @@
|
| return str;
|
| }
|
|
|
| - // Append the library name to library units.
|
| - ProjectManager projectManager = DartCore.getProjectManager();
|
| - SourceKind kind = projectManager.getSourceKind((IFile) resource);
|
| -
|
| - if (kind == SourceKind.LIBRARY) {
|
| - LibraryElement libraryElement = projectManager.getLibraryElementOrNull((IFile) resource);
|
| -
|
| - if (libraryElement != null) {
|
| - String name = libraryElement.getName();
|
| -
|
| - if (name == null || name.length() == 0) {
|
| -
|
| - if (libraryElement.getEntryPoint() != null) {
|
| - name = FilenameUtils.removeExtension(resource.getName());
|
| - }
|
| - }
|
| -
|
| - string.append(" [" + name + "]", StyledString.QUALIFIER_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
|
| - }
|
| - }
|
| + // TODO(scheglov) disabled because even with tasks it causes short, but noticeable UI locks
|
| +// // Append the library name to library units.
|
| +// ProjectManager projectManager = DartCore.getProjectManager();
|
| +// SourceKind kind = projectManager.getSourceKind((IFile) resource);
|
| +//
|
| +// if (kind == SourceKind.LIBRARY) {
|
| +// LibraryElement libraryElement = projectManager.getLibraryElementOrNull((IFile) resource);
|
| +//
|
| +// if (libraryElement != null) {
|
| +// String name = libraryElement.getName();
|
| +//
|
| +// if (name == null || name.length() == 0) {
|
| +//
|
| +// if (libraryElement.getEntryPoint() != null) {
|
| +// name = FilenameUtils.removeExtension(resource.getName());
|
| +// }
|
| +// }
|
| +//
|
| +// string.append(" [" + name + "]", StyledString.QUALIFIER_STYLER); //$NON-NLS-1$ //$NON-NLS-2$
|
| +// }
|
| +// }
|
| }
|
| } catch (Throwable th) {
|
| DartToolsPlugin.log(th);
|
|
|