| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/compare/DartMergeViewer.java
|
| diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/compare/DartMergeViewer.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/compare/DartMergeViewer.java
|
| index 3a6534e4873dea683409fa0b6115f538a9098c6a..5182cff1dc35afc52ffd004f4e4f825a49fe1e41 100644
|
| --- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/compare/DartMergeViewer.java
|
| +++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/compare/DartMergeViewer.java
|
| @@ -13,8 +13,6 @@
|
| */
|
| package com.google.dart.tools.ui.internal.compare;
|
|
|
| -import com.google.dart.tools.core.DartCore;
|
| -import com.google.dart.tools.core.model.DartElement;
|
| import com.google.dart.tools.core.model.DartProject;
|
| import com.google.dart.tools.ui.DartToolsPlugin;
|
| import com.google.dart.tools.ui.internal.text.editor.CompilationUnitEditor;
|
| @@ -29,7 +27,6 @@ import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
|
| import org.eclipse.compare.structuremergeviewer.ICompareInput;
|
| import org.eclipse.compare.structuremergeviewer.IDiffContainer;
|
| import org.eclipse.compare.structuremergeviewer.IDiffElement;
|
| -import org.eclipse.core.resources.IResource;
|
| import org.eclipse.core.runtime.Assert;
|
| import org.eclipse.core.runtime.CoreException;
|
| import org.eclipse.jface.action.IAction;
|
| @@ -222,15 +219,6 @@ public class DartMergeViewer extends TextMergeViewer {
|
| rp = (IResourceProvider) te;
|
| }
|
| }
|
| - if (rp != null) {
|
| - IResource resource = rp.getResource();
|
| - if (resource != null) {
|
| - DartElement element = DartCore.create(resource);
|
| - if (element != null) {
|
| - return element.getDartProject();
|
| - }
|
| - }
|
| - }
|
| return null;
|
| }
|
|
|
|
|