Fixed Bugzilla Bug 102674: reduce size of taskscapes

4 files changed, 21 insertions, 21 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java
index 44c2d2aa0..91505e000 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java
@@ -16,8 +16,8 @@ package org.eclipse.mylar.bugs;
 import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider;
 import org.eclipse.mylar.bugzilla.core.BugReport;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
-import org.eclipse.mylar.core.IMylarContextEdge;
-import org.eclipse.mylar.core.IMylarContextNode;
+import org.eclipse.mylar.core.IMylarRelation;
+import org.eclipse.mylar.core.IMylarElement;
 import org.eclipse.mylar.core.IMylarStructureBridge;
 import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.ui.AbstractContextLabelProvider;
@@ -30,12 +30,12 @@ import org.eclipse.swt.graphics.Image;
 public class BugzillaContextLabelProvider extends AbstractContextLabelProvider {
 	
 	@Override
-	protected Image getImage(IMylarContextNode node) {
+	protected Image getImage(IMylarElement node) {
 		return MylarImages.getImage(MylarImages.BUG); 
 	}
 
 	@Override
-	protected Image getImage(IMylarContextEdge edge) {
+	protected Image getImage(IMylarRelation edge) {
 		return MylarImages.getImage(MylarBugsPlugin.EDGE_REF_BUGZILLA); 
 	}
 
@@ -53,23 +53,23 @@ public class BugzillaContextLabelProvider extends AbstractContextLabelProvider {
      * TODO: slow?
      */
 	@Override
-	protected String getText(IMylarContextNode node) {        
+	protected String getText(IMylarElement node) {        
         // try to get from the cache before downloading
         Object report;
-    	BugzillaReportNode reportNode = MylarBugsPlugin.getReferenceProvider().getCached(node.getElementHandle());
-    	BugReport cachedReport = MylarBugsPlugin.getDefault().getCache().getCached(node.getElementHandle());
+    	BugzillaReportNode reportNode = MylarBugsPlugin.getReferenceProvider().getCached(node.getHandleIdentifier());
+    	BugReport cachedReport = MylarBugsPlugin.getDefault().getCache().getCached(node.getHandleIdentifier());
     	IMylarStructureBridge bridge = MylarPlugin.getDefault().getStructureBridge(BugzillaStructureBridge.CONTENT_TYPE);
 		
     	if(reportNode != null && cachedReport == null){
     		report = reportNode;
     	} else{
-     		report = bridge.getObjectForHandle(node.getElementHandle());
+     		report = bridge.getObjectForHandle(node.getHandleIdentifier());
     	}
         return bridge.getName(report);
 	}
 
 	@Override
-	protected String getText(IMylarContextEdge edge) {
+	protected String getText(IMylarRelation edge) {
 		return BugzillaReferencesProvider.NAME;  
 	}
 } 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaStructureBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaStructureBridge.java
index 2039a9334..275d0877b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaStructureBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaStructureBridge.java
@@ -28,7 +28,7 @@ import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.AbstractRelationProvider;
 import org.eclipse.mylar.core.IDegreeOfSeparation;
-import org.eclipse.mylar.core.IMylarContextNode;
+import org.eclipse.mylar.core.IMylarElement;
 import org.eclipse.mylar.core.IMylarStructureBridge;
 import org.eclipse.mylar.core.internal.DegreeOfSeparation;
 import org.eclipse.ui.IEditorPart;
@@ -251,7 +251,7 @@ public class BugzillaStructureBridge implements IMylarStructureBridge {
 		// ignore
 	}
 
-	public boolean containsProblem(IMylarContextNode node) {
+	public boolean containsProblem(IMylarElement node) {
 		// TODO Auto-generated method stub
 		return false;
 	}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
index d1f0936a8..5d9cece4e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
@@ -24,7 +24,7 @@ import org.eclipse.mylar.bugzilla.ui.ViewBugzillaAction;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTaskEditor;
-import org.eclipse.mylar.core.IMylarContextNode;
+import org.eclipse.mylar.core.IMylarElement;
 import org.eclipse.mylar.ui.IMylarUiBridge;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
@@ -36,8 +36,8 @@ public class BugzillaUiBridge implements IMylarUiBridge {
 
     protected BugzillaContextLabelProvider labelProvider = new BugzillaContextLabelProvider();
     
-    public void open(IMylarContextNode node) {
-        String handle = node.getElementHandle();
+    public void open(IMylarElement node) {
+        String handle = node.getHandleIdentifier();
         String bugHandle = handle;
         String server =handle.substring(0, handle.indexOf(";"));
                
@@ -73,7 +73,7 @@ public class BugzillaUiBridge implements IMylarUiBridge {
         return labelProvider;
     }
 
-    public void close(IMylarContextNode node) {
+    public void close(IMylarElement 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/bugs/search/BugzillaReferencesProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaReferencesProvider.java
index db370ffaa..7f7575502 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaReferencesProvider.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaReferencesProvider.java
@@ -30,7 +30,7 @@ import org.eclipse.mylar.bugs.BugzillaStructureBridge;
 import org.eclipse.mylar.bugs.MylarBugsPlugin;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.AbstractRelationProvider;
-import org.eclipse.mylar.core.IMylarContextNode;
+import org.eclipse.mylar.core.IMylarElement;
 import org.eclipse.mylar.core.search.IActiveSearchListener;
 import org.eclipse.mylar.core.search.IMylarSearchOperation;
 import org.eclipse.ui.PlatformUI;
@@ -58,9 +58,9 @@ public class BugzillaReferencesProvider extends AbstractRelationProvider {
      * HACK: checking kind as string - don't want the dependancy to mylar.java
      */
     @Override
-    protected void findRelated(final IMylarContextNode node, int degreeOfSeparation) {
+    protected void findRelated(final IMylarElement node, int degreeOfSeparation) {
         if (!node.getContentType().equals("java")) return; 
-        IJavaElement javaElement = JavaCore.create(node.getElementHandle());
+        IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
         if (!acceptElement(javaElement)) {
             return; 
         }
@@ -68,12 +68,12 @@ public class BugzillaReferencesProvider extends AbstractRelationProvider {
     }
 
 	@Override
-	public IMylarSearchOperation getSearchOperation(IMylarContextNode node, int limitTo, int degreeOfSepatation) {
-		IJavaElement javaElement = JavaCore.create(node.getElementHandle());
+	public IMylarSearchOperation getSearchOperation(IMylarElement node, int limitTo, int degreeOfSepatation) {
+		IJavaElement javaElement = JavaCore.create(node.getHandleIdentifier());
 		return new BugzillaMylarSearch(degreeOfSepatation, javaElement); 
 	}
     
-	private void runJob(final IMylarContextNode node,  final int degreeOfSeparation) {
+	private void runJob(final IMylarElement node,  final int degreeOfSeparation) {
 		BugzillaMylarSearch search = (BugzillaMylarSearch)getSearchOperation(node, 0, degreeOfSeparation);        
 		
         search.addListener(new IActiveSearchListener(){