Improved naming in core

4 files changed, 10 insertions, 10 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaNodeLabelProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaNodeLabelProvider.java
index b43781a00..5ff40382c 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaNodeLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaNodeLabelProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.mylar.bugzilla.core.BugReport;
 import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.core.model.ITaskscapeNode;
+import org.eclipse.mylar.core.IMylarContextNode;
 import org.eclipse.mylar.ui.MylarImages;
 import org.eclipse.swt.graphics.Image;
 
@@ -34,7 +34,7 @@ public class BugzillaNodeLabelProvider implements ILabelProvider {
      * TODO: slow?
      */
     public String getText(Object element) {
-        ITaskscapeNode node = (ITaskscapeNode)element;
+        IMylarContextNode node = (IMylarContextNode)element;
         
         // try to get from the cache before downloading
         Object report;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaUiBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaUiBridge.java
index 9a340df45..8a491885d 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaUiBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugzilla/BugzillaUiBridge.java
@@ -26,7 +26,7 @@ import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage;
 import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTask;
 import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaTaskEditor;
-import org.eclipse.mylar.core.model.ITaskscapeNode;
+import org.eclipse.mylar.core.IMylarContextNode;
 import org.eclipse.mylar.tasks.ITask;
 import org.eclipse.mylar.tasks.MylarTasksPlugin;
 import org.eclipse.mylar.tasks.search.BugzillaReferencesProvider;
@@ -42,7 +42,7 @@ public class BugzillaUiBridge implements IMylarUiBridge {
 
     protected BugzillaNodeLabelProvider labelProvider = new BugzillaNodeLabelProvider();
     
-    public void open(ITaskscapeNode node) {
+    public void open(IMylarContextNode node) {
         String handle = node.getElementHandle();
         String bugHandle = handle;
         String server =handle.substring(0, handle.indexOf(";"));
@@ -79,7 +79,7 @@ public class BugzillaUiBridge implements IMylarUiBridge {
         return labelProvider;
     }
 
-    public void close(ITaskscapeNode node) {
+    public void close(IMylarContextNode node) {
         IWorkbenchPage page = Workbench.getInstance().getActiveWorkbenchWindow().getActivePage();
         if (page != null) {
             IEditorReference[] references = page.getEditorReferences();
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearch.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearch.java
index 0abfd8126..aba86a323 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearch.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaMylarSearch.java
@@ -25,7 +25,7 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMember;
 import org.eclipse.mylar.bugzilla.BugzillaMylarBridge;
 import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.core.model.InterestComparator;
+import org.eclipse.mylar.core.InterestComparator;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
 import org.eclipse.mylar.core.search.IMylarSearchOperation;
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaReferencesProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaReferencesProvider.java
index 7212b8995..12b76f43f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaReferencesProvider.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/search/BugzillaReferencesProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.mylar.bugzilla.BugzillaStructureBridge;
 import org.eclipse.mylar.bugzilla.MylarBugzillaPlugin;
 import org.eclipse.mylar.bugzilla.ui.tasks.BugzillaReportNode;
-import org.eclipse.mylar.core.model.ITaskscapeNode;
+import org.eclipse.mylar.core.IMylarContextNode;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
 import org.eclipse.mylar.core.search.IMylarSearchOperation;
 import org.eclipse.mylar.core.search.RelationshipProvider;
@@ -54,7 +54,7 @@ public class BugzillaReferencesProvider extends RelationshipProvider {
      * HACK: checking kind as string - don't want the dependancy to mylar.java
      */
     @Override
-    protected void findRelated(final ITaskscapeNode node, int degreeOfSeparation) {
+    protected void findRelated(final IMylarContextNode node, int degreeOfSeparation) {
         if (!node.getStructureKind().equals("java")) return; 
         IJavaElement javaElement = JavaCore.create(node.getElementHandle());
         if (!acceptElement(javaElement)) {
@@ -66,12 +66,12 @@ public class BugzillaReferencesProvider extends RelationshipProvider {
     }
 
 	@Override
-	public IMylarSearchOperation getSearchOperation(ITaskscapeNode node, int limitTo, int degreeOfSepatation) {
+	public IMylarSearchOperation getSearchOperation(IMylarContextNode node, int limitTo, int degreeOfSepatation) {
 		IJavaElement javaElement = JavaCore.create(node.getElementHandle());
 		return new BugzillaMylarSearch(degreeOfSepatation, javaElement); 
 	}
     
-	private void runJob(final ITaskscapeNode node,  final int degreeOfSeparation) {
+	private void runJob(final IMylarContextNode node,  final int degreeOfSeparation) {
 		BugzillaMylarSearch search = (BugzillaMylarSearch)getSearchOperation(node, 0, degreeOfSeparation);        
 		
         search.addListener(new IActiveSearchListener(){