Progress on Bug #104253: make mylar bridges extension points

10 files changed, 149 insertions, 132 deletions

diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index f7259911a..65ee9f350 100644
--- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Mylar Bugs Plug-in
 Bundle-SymbolicName: org.eclipse.mylar.bugs; singleton:=true
 Bundle-Version: 0.3.6
-Bundle-Activator: org.eclipse.mylar.bugs.MylarBugzillaPlugin
+Bundle-Activator: org.eclipse.mylar.bugs.MylarBugsPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.tasks.core/plugin.xml b/org.eclipse.mylyn.tasks.core/plugin.xml
index 115a2aa0c..aeac0546c 100644
--- a/org.eclipse.mylyn.tasks.core/plugin.xml
+++ b/org.eclipse.mylyn.tasks.core/plugin.xml
@@ -3,11 +3,13 @@
 <?eclipse version="3.0"?>
 <plugin>
    <extension
-         name="Mylar Bugzilla startup"
-         point="org.eclipse.ui.startup">
-   </extension>
-   <extension
          point="org.eclipse.mylar.java.javaEditorContributor">
       <hyperlinkDetector class="org.eclipse.mylar.bugs.java.BugzillaHyperLinkDetector"/>
+   </extension>
+   <extension
+         point="org.eclipse.mylar.core.context">
+      <structureBridge
+            class="org.eclipse.mylar.bugs.BugzillaStructureBridge"
+            name="Bugzilla Structure Bridge"/>
    </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/BugzillaNodeLabelProvider.java
index 415749274..934106726 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/BugzillaNodeLabelProvider.java
@@ -18,6 +18,8 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.mylar.bugzilla.core.BugReport;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.IMylarContextNode;
+import org.eclipse.mylar.core.IMylarStructureBridge;
+import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.ui.MylarImages;
 import org.eclipse.swt.graphics.Image;
 
@@ -38,14 +40,16 @@ public class BugzillaNodeLabelProvider implements ILabelProvider {
         
         // try to get from the cache before downloading
         Object report;
-    	BugzillaReportNode reportNode = MylarBugzillaPlugin.getReferenceProvider().getCached(node.getElementHandle());
-    	BugReport cachedReport = MylarBugzillaPlugin.getDefault().getStructureBridge().getCached(node.getElementHandle());
+    	BugzillaReportNode reportNode = MylarBugsPlugin.getReferenceProvider().getCached(node.getElementHandle());
+    	BugReport cachedReport = MylarBugsPlugin.getDefault().getCache().getCached(node.getElementHandle());
+    	IMylarStructureBridge bridge = MylarPlugin.getDefault().getStructureBridge(BugzillaStructureBridge.EXTENSION);
+		
     	if(reportNode != null && cachedReport == null){
     		report = reportNode;
     	} else{
-    		report = MylarBugzillaPlugin.getDefault().getStructureBridge().getObjectForHandle(node.getElementHandle());
+     		report = bridge.getObjectForHandle(node.getElementHandle());
     	}
-        return MylarBugzillaPlugin.getDefault().getStructureBridge().getName(report);
+        return bridge.getName(report);
     }
 
     public void addListener(ILabelProviderListener listener) {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaReportCache.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaReportCache.java
new file mode 100644
index 000000000..1071ca01f
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaReportCache.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2004 - 2005 University Of British Columbia and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     University Of British Columbia - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylar.bugs;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.mylar.bugzilla.core.BugReport;
+import org.eclipse.mylar.bugzilla.core.BugzillaTools;
+import org.eclipse.mylar.bugzilla.core.IBugzillaBug;
+import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCacheFile;
+import org.eclipse.mylar.core.MylarPlugin;
+
+/**
+ * @author Shawn Minto
+ */
+public class BugzillaReportCache {
+
+	private Map<String, BugReport> cache = new HashMap<String, BugReport>();
+
+    public void cache(String handle, BugReport report) {
+		cache.put(handle, report);
+		cacheFile.add(report);
+	}
+    
+    public void clearCache(){
+    	cache.clear();
+    	cacheFile.removeAll();
+    }
+
+    public BugReport getFromCache(String bugHandle) {
+		return cache.get(bugHandle);
+	}
+    
+    public Set<String> getCachedHandles(){
+    	return cache.keySet();
+    }
+
+    private BugzillaCacheFile cacheFile;
+	
+	private IPath getCacheFile() {
+		IPath stateLocation = Platform.getPluginStateLocation(MylarBugsPlugin.getDefault());
+		IPath configFile = stateLocation.append("offlineReports");
+		return configFile;
+	}
+	
+	public void readCacheFile() {
+		IPath cachPath = getCacheFile();
+
+		try {
+			cacheFile = new BugzillaCacheFile(cachPath.toFile());
+			ArrayList<IBugzillaBug> cached = cacheFile.elements();
+			for(IBugzillaBug bug: cached){
+				if(bug instanceof BugReport)
+					cache.put(BugzillaTools.getHandle(bug), (BugReport)bug);
+			}
+		} catch (Exception e) {
+		    MylarPlugin.log(e, "occurred while restoring saved offline Bugzilla reports.");
+		}
+	}
+
+	public BugReport getCached(String handle) {
+		return cache.get(handle);
+	}	
+}
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 6066e9c18..5f92e68fe 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
@@ -8,37 +8,27 @@
  * Contributors:
  *     University Of British Columbia - initial API and implementation
  *******************************************************************************/
-/*
- * Created on May 2, 2005
-  */
+
 package org.eclipse.mylar.bugs;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.mylar.bugzilla.core.BugReport;
 import org.eclipse.mylar.bugzilla.core.BugzillaRepository;
 import org.eclipse.mylar.bugzilla.core.BugzillaTools;
-import org.eclipse.mylar.bugzilla.core.IBugzillaBug;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchHit;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlineNode;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaReportSelection;
-import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCacheFile;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.AbstractRelationshipProvider;
 import org.eclipse.mylar.core.IDegreeOfSeparation;
 import org.eclipse.mylar.core.IMylarStructureBridge;
-import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.core.internal.DegreeOfSeparation;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
@@ -59,9 +49,8 @@ public class BugzillaStructureBridge implements IMylarStructureBridge {
     
     public BugzillaStructureBridge() {
         super();
-		readCacheFile();
 		providers = new ArrayList<AbstractRelationshipProvider>();
-    	providers.add(MylarBugzillaPlugin.getReferenceProvider());
+    	providers.add(MylarBugsPlugin.getReferenceProvider());
     }
 
     /**
@@ -111,10 +100,10 @@ public class BugzillaStructureBridge implements IMylarStructureBridge {
             	return findNode(node, commentNumber);
             }
 
-            BugzillaReportNode reportNode = MylarBugzillaPlugin.getReferenceProvider().getCached(handle);
+            BugzillaReportNode reportNode = MylarBugsPlugin.getReferenceProvider().getCached(handle);
             
             // try to get from the cache, if it doesn't exist, startup an operation to get it
-            result = getFromCache(bugHandle);
+            result = MylarBugsPlugin.getDefault().getCache().getFromCache(bugHandle);
             if(result == null && reportNode != null){
             	return reportNode;
             } else if(result == null && reportNode == null){
@@ -139,7 +128,7 @@ public class BugzillaStructureBridge implements IMylarStructureBridge {
                     }
                 	
             	if(result != null)
-            		cache(bugHandle, result);
+            		MylarBugsPlugin.getDefault().getCache().cache(bugHandle, result);
             }
 
             BugzillaOutlineNode node = BugzillaOutlineNode.parseBugReport(result);
@@ -235,60 +224,6 @@ public class BugzillaStructureBridge implements IMylarStructureBridge {
         return getResourceExtension();
     }
 
-	/*
-	 *
-	 * STUFF FOR CACHING BUG REPORTS
-	 * 
-	 */
-    
-    // bug report cache
-	private Map<String, BugReport> cache = new HashMap<String, BugReport>();
-
-    public void cache(String handle, BugReport report) {
-		cache.put(handle, report);
-		cacheFile.add(report);
-	}
-    
-    public void clearCache(){
-    	cache.clear();
-    	cacheFile.removeAll();
-    }
-
-	private BugReport getFromCache(String bugHandle) {
-		return cache.get(bugHandle);
-	}
-    
-    public Set<String> getCachedHandles(){
-    	return cache.keySet();
-    }
-
-    private BugzillaCacheFile cacheFile;
-	
-	private IPath getCacheFile() {
-		IPath stateLocation = Platform.getPluginStateLocation(MylarBugzillaPlugin.getDefault());
-		IPath configFile = stateLocation.append("offlineReports");
-		return configFile;
-	}
-	
-	private void readCacheFile() {
-		IPath cachPath = getCacheFile();
-
-		try {
-			cacheFile = new BugzillaCacheFile(cachPath.toFile());
-			ArrayList<IBugzillaBug> cached = cacheFile.elements();
-			for(IBugzillaBug bug: cached){
-				if(bug instanceof BugReport)
-					cache.put(BugzillaTools.getHandle(bug), (BugReport)bug);
-			}
-		} catch (Exception e) {
-		    MylarPlugin.log(e, "occurred while restoring saved offline Bugzilla reports.");
-		}
-	}
-
-	public BugReport getCached(String handle) {
-		return cache.get(handle);
-	}
-
 	public List<AbstractRelationshipProvider> getProviders() {
 		return providers;
 	}
@@ -307,4 +242,8 @@ public class BugzillaStructureBridge implements IMylarStructureBridge {
 	public String getHandleForOffsetInObject(Object resource, int offset) {
 		return null;
 	}
+
+	public void setParentBridge(IMylarStructureBridge bridge) {
+		// ignore
+	}
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugzillaPlugin.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java
index c98b50c48..d02f9d8f4 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugzillaPlugin.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java
@@ -10,15 +10,10 @@
  *******************************************************************************/
 package org.eclipse.mylar.bugs;
 
-import java.util.List;
-
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.mylar.bugs.search.BugzillaReferencesProvider;
-import org.eclipse.mylar.core.AbstractRelationshipProvider;
 import org.eclipse.mylar.core.MylarPlugin;
 import org.eclipse.mylar.ui.MylarUiPlugin;
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -27,41 +22,35 @@ import org.osgi.framework.BundleContext;
 /**
  * The main plugin class to be used in the desktop.
  */
-public class MylarBugzillaPlugin extends AbstractUIPlugin implements IStartup {
+public class MylarBugsPlugin extends AbstractUIPlugin {
 
     private static BugzillaMylarBridge bridge = null;
-    private BugzillaStructureBridge structureBridge;
+//    private BugzillaStructureBridge structureBridge;
     private static BugzillaReferencesProvider referencesProvider = new BugzillaReferencesProvider();
-	private static MylarBugzillaPlugin plugin;
-
-	public MylarBugzillaPlugin() {
+	private static MylarBugsPlugin plugin;
+	private BugzillaReportCache cache;
+	
+	
+	public MylarBugsPlugin() {
 		plugin = this;
 	}
 
-    public void earlyStartup() {
-        final IWorkbench workbench = PlatformUI.getWorkbench();
-        workbench.getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                structureBridge = new BugzillaStructureBridge();
-            	
-                MylarPlugin.getDefault().addBridge(structureBridge);
-                MylarUiPlugin.getDefault().addAdapter(BugzillaStructureBridge.EXTENSION, new BugzillaUiBridge());
-                MylarPlugin.getDefault().getSelectionMonitors().add(new BugzillaEditingMonitor());             
-                
-                IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
-                if (window != null) {
-                    // create a new bridge and initialize it
-                    bridge = new BugzillaMylarBridge();
-                }
-            }
-        });
-    }
-	
 	/**
 	 * This method is called upon plug-in activation
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+		cache = new BugzillaReportCache();
+		cache.readCacheFile();
+
+        MylarUiPlugin.getDefault().addAdapter(BugzillaStructureBridge.EXTENSION, new BugzillaUiBridge());
+        MylarPlugin.getDefault().getSelectionMonitors().add(new BugzillaEditingMonitor());             
+        
+        IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+        if (window != null) {
+            // create a new bridge and initialize it
+            bridge = new BugzillaMylarBridge();
+        }
 	}
 
 	/**
@@ -71,18 +60,18 @@ public class MylarBugzillaPlugin extends AbstractUIPlugin implements IStartup {
 		super.stop(context);
 		plugin = null;
 
-        List<AbstractRelationshipProvider> providers = structureBridge.getProviders();
-        if(providers != null){
-	        for(AbstractRelationshipProvider provider: providers){
-	        	provider.stopAllRunningJobs();
-	        }
-        }
+//        List<AbstractRelationshipProvider> providers = structureBridge.getProviders();
+//        if(providers != null){
+//	        for(AbstractRelationshipProvider provider: providers){
+//	        	provider.stopAllRunningJobs();
+//	        }
+//        }
 	}
 
 	/**
 	 * Returns the shared instance.
 	 */
-	public static MylarBugzillaPlugin getDefault() {
+	public static MylarBugsPlugin getDefault() {
 		return plugin;
 	}
 
@@ -106,12 +95,16 @@ public class MylarBugzillaPlugin extends AbstractUIPlugin implements IStartup {
     }
     
     
-    public BugzillaStructureBridge getStructureBridge() {
-        return structureBridge;
-    }
+//    public BugzillaStructureBridge getStructureBridge() {
+//        return structureBridge;
+//    }
 
 	public static BugzillaReferencesProvider getReferenceProvider() {
 		return referencesProvider;
 		
 	}
+
+	public BugzillaReportCache getCache() {
+		return cache;
+	}
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchOperation.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchOperation.java
index 108d6f069..5e43335d4 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchOperation.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/search/BugzillaMylarSearchOperation.java
@@ -27,7 +27,7 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMember;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugs.MylarBugsPlugin;
 import org.eclipse.mylar.bugzilla.core.BugReport;
 import org.eclipse.mylar.bugzilla.core.Comment;
 import org.eclipse.mylar.bugzilla.core.search.BugzillaSearchEngine;
@@ -135,7 +135,7 @@ public class BugzillaMylarSearchOperation extends WorkspaceModifyOperation
         
         // we completed the search, so notify all of the listeners
         // that the search has been completed
-        MylarBugzillaPlugin.getBridge().addToLandmarksHash(doiList, javaElement, scope);
+        MylarBugsPlugin.getBridge().addToLandmarksHash(doiList, javaElement, scope);
         search.notifySearchCompleted(
                 doiList);
         // MIK: commmented out logging
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 261c172a7..80fae34b0 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
@@ -26,7 +26,7 @@ import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.mylar.bugs.BugzillaMylarBridge;
 import org.eclipse.mylar.bugs.BugzillaStructureBridge;
-import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugs.MylarBugsPlugin;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.core.AbstractRelationshipProvider;
 import org.eclipse.mylar.core.IMylarContextNode;
@@ -81,17 +81,15 @@ public class BugzillaReferencesProvider extends AbstractRelationshipProvider {
             public void searchCompleted(List<?> nodes) {
                 Iterator<?> itr = nodes.iterator();
 
-                if(MylarBugzillaPlugin.getDefault() == null)
+                if(MylarBugsPlugin.getDefault() == null)
                 	return;
-                	
-                BugzillaStructureBridge bridge = MylarBugzillaPlugin.getDefault().getStructureBridge();
                 
                 while(itr.hasNext()) {
                     Object o = itr.next();
                     if(o instanceof BugzillaReportNode){
                         BugzillaReportNode bugzillaNode = (BugzillaReportNode)o;
                         final String handle = bugzillaNode.getElementHandle();
-                        if(bridge.getCached(handle) == null)
+                        if(MylarBugsPlugin.getDefault().getCache().getCached(handle) == null)
                         	cache(handle, bugzillaNode);
                         
                         PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
index 6dc99c288..72148a8b8 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/bugzilla/tests/BugzillaSearchPluginTest.java
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
-import org.eclipse.mylar.bugs.MylarBugzillaPlugin;
+import org.eclipse.mylar.bugs.MylarBugsPlugin;
 import org.eclipse.mylar.bugs.search.BugzillaMylarSearch;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaReportNode;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
@@ -127,7 +127,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		
 		// display the time it took for the search
 //		System.err.println("Search Took About " + time + " seconds");
-    	MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
+    	MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
 	 }
  
  	/**
@@ -163,7 +163,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		// display the time it took for the search and the results returned
 //		System.err.println("Search Took About " + time + " seconds");
 //		System.err.println(c);
-		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
+		MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
 
 	}
 	
@@ -200,12 +200,12 @@ public class BugzillaSearchPluginTest extends TestCase{
 		assertTrue("Results not the right size", c.size() > 0); // TODO should be assertEquals on expected size
 		
 		// check that the search has been saved
-		List<BugzillaReportNode> saved = MylarBugzillaPlugin.getBridge().getFromLandmarksHash(astNodeType, BugzillaMylarSearch.UNQUAL);
+		List<BugzillaReportNode> saved = MylarBugsPlugin.getBridge().getFromLandmarksHash(astNodeType, BugzillaMylarSearch.UNQUAL);
 		assertTrue("Results not cached", saved != null);
 		assertTrue("Results not the right size", saved.size() > 0); // TODO should be assertEquals on expected size
 		
 		assertTrue(c.containsAll(saved) && saved.containsAll(c));
-		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
+		MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
 	}
 	
 	public void testLocalBugUnqual() throws InterruptedException {
@@ -265,7 +265,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		List<?> c = lists.get(0);
 		assertEquals("Results not the right size", 3, c.size());
 		
-		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
+		MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
         MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 	}
 	
@@ -324,7 +324,7 @@ public class BugzillaSearchPluginTest extends TestCase{
 		List<?> c = lists.get(0);
 		assertEquals("Results not the right size", 1, c.size());
 		
-		MylarBugzillaPlugin.getBridge().removeFromLandmarksHash(astNodeType);
+		MylarBugsPlugin.getBridge().removeFromLandmarksHash(astNodeType);
         MylarTasklistPlugin.getTaskListManager().deleteCategory(cat);
 	}
 	
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExtensionReader.java
index 778feb88a..ffcf129c4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExtensionReader.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListExtensionReader.java
@@ -25,6 +25,9 @@ import org.eclipse.mylar.tasklist.ITaskListExternalizer;
 import org.eclipse.mylar.tasklist.ITaskListener;
 import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 
+/**
+ * @author Shawn Minto
+ */
 public class TaskListExtensionReader {
 	private static boolean extensionsRead = false;
 	private static TaskListExtensionReader thisReader = new TaskListExtensionReader();