diff options
author | mkersten | 2005-08-31 01:37:27 +0000 |
---|---|---|
committer | mkersten | 2005-08-31 01:37:27 +0000 |
commit | 01bb119405c704760da012d1f79a30cd8ac9c433 (patch) | |
tree | 130945ab1794b3581049c0ef0c1d0752200d91c0 /org.eclipse.mylyn.tasks.core | |
parent | c37fd117123b54374712466e04ee0ccad1ae0644 (diff) | |
download | org.eclipse.mylyn.tasks-01bb119405c704760da012d1f79a30cd8ac9c433.tar.gz org.eclipse.mylyn.tasks-01bb119405c704760da012d1f79a30cd8ac9c433.tar.xz org.eclipse.mylyn.tasks-01bb119405c704760da012d1f79a30cd8ac9c433.zip |
Fixed Bug #104253: make mylar bridges extension points
Diffstat (limited to 'org.eclipse.mylyn.tasks.core')
-rw-r--r-- | org.eclipse.mylyn.tasks.core/plugin.xml | 6 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaNodeLabelProvider.java) | 45 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java | 14 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaReferencesProvider.java | 2 |
5 files changed, 29 insertions, 41 deletions
diff --git a/org.eclipse.mylyn.tasks.core/plugin.xml b/org.eclipse.mylyn.tasks.core/plugin.xml index aeac0546c..a13527175 100644 --- a/org.eclipse.mylyn.tasks.core/plugin.xml +++ b/org.eclipse.mylyn.tasks.core/plugin.xml @@ -11,5 +11,11 @@ <structureBridge class="org.eclipse.mylar.bugs.BugzillaStructureBridge" name="Bugzilla Structure Bridge"/> + </extension> + <extension + point="org.eclipse.mylar.ui.context"> + <uiBridge + class="org.eclipse.mylar.bugs.BugzillaUiBridge" + contentType="bugzilla"/> </extension> </plugin> diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaNodeLabelProvider.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java index 934106726..740372d52 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaNodeLabelProvider.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaContextLabelProvider.java @@ -13,31 +13,37 @@ */ package org.eclipse.mylar.bugs; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; +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.IMylarStructureBridge; import org.eclipse.mylar.core.MylarPlugin; +import org.eclipse.mylar.ui.AbstractContextLabelProvider; import org.eclipse.mylar.ui.MylarImages; import org.eclipse.swt.graphics.Image; /** * @author Mik Kersten */ -public class BugzillaNodeLabelProvider implements ILabelProvider { +public class BugzillaContextLabelProvider extends AbstractContextLabelProvider { + + @Override + protected Image getImage(IMylarContextNode node) { + return MylarImages.getImage(MylarImages.BUG); + } - public Image getImage(Object element) { - return MylarImages.getImage(MylarImages.BUG); - } + @Override + protected Image getImage(IMylarContextEdge edge) { + return MylarImages.getImage(MylarImages.EDGE_REF_BUGZILLA); + } /** * TODO: slow? */ - public String getText(Object element) { - IMylarContextNode node = (IMylarContextNode)element; - + @Override + protected String getText(IMylarContextNode node) { // try to get from the cache before downloading Object report; BugzillaReportNode reportNode = MylarBugsPlugin.getReferenceProvider().getCached(node.getElementHandle()); @@ -50,21 +56,10 @@ public class BugzillaNodeLabelProvider implements ILabelProvider { report = bridge.getObjectForHandle(node.getElementHandle()); } return bridge.getName(report); - } + } - public void addListener(ILabelProviderListener listener) { - // don't need to worry about listeners - } - - public void dispose() { - // don't care about dispose - } - - public boolean isLabelProperty(Object element, String property) { - return false; - } - - public void removeListener(ILabelProviderListener listener) { - // don't need to worry about listeners - } + @Override + protected String getText(IMylarContextEdge edge) { + return BugzillaReferencesProvider.NAME; + } } 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 f558a686e..4723b3c18 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 @@ -17,10 +17,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider; import org.eclipse.mylar.bugzilla.ui.BugzillaOpenStructure; import org.eclipse.mylar.bugzilla.ui.ViewBugzillaAction; import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor; @@ -28,7 +26,6 @@ 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.ui.IMylarUiBridge; -import org.eclipse.mylar.ui.MylarImages; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IWorkbenchPage; @@ -37,7 +34,7 @@ import org.eclipse.ui.internal.Workbench; public class BugzillaUiBridge implements IMylarUiBridge { - protected BugzillaNodeLabelProvider labelProvider = new BugzillaNodeLabelProvider(); + protected BugzillaContextLabelProvider labelProvider = new BugzillaContextLabelProvider(); public void open(IMylarContextNode node) { String handle = node.getElementHandle(); @@ -126,13 +123,4 @@ public class BugzillaUiBridge implements IMylarUiBridge { treeViewer.expandAll(); } } - - public ImageDescriptor getIconForRelationship(String relationshipHandle) { - return MylarImages.EDGE_REF_BUGZILLA; - - } - - public String getNameForRelationship(String relationshipHandle) { - return BugzillaReferencesProvider.NAME; - } } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java index d02f9d8f4..e7565be1d 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java @@ -13,7 +13,6 @@ package org.eclipse.mylar.bugs; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider; import org.eclipse.mylar.core.MylarPlugin; -import org.eclipse.mylar.ui.MylarUiPlugin; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -43,7 +42,7 @@ public class MylarBugsPlugin extends AbstractUIPlugin { cache = new BugzillaReportCache(); cache.readCacheFile(); - MylarUiPlugin.getDefault().addAdapter(BugzillaStructureBridge.EXTENSION, new BugzillaUiBridge()); +// MylarUiPlugin.getDefault().addAdapter(BugzillaStructureBridge.EXTENSION, new BugzillaUiBridge()); MylarPlugin.getDefault().getSelectionMonitors().add(new BugzillaEditingMonitor()); IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); 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 9e3527e00..43f537cd4 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 @@ -58,7 +58,7 @@ public class BugzillaReferencesProvider extends AbstractRelationshipProvider { */ @Override protected void findRelated(final IMylarContextNode node, int degreeOfSeparation) { - if (!node.getStructureKind().equals("java")) return; + if (!node.getContentKind().equals("java")) return; IJavaElement javaElement = JavaCore.create(node.getElementHandle()); if (!acceptElement(javaElement)) { return; |