diff options
| -rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/build.properties | 6 | ||||
| -rw-r--r-- | org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/MylarBugsPlugin.java | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/build.properties b/org.eclipse.mylyn.bugzilla.ui/build.properties index f4537c1f1..30fa49273 100644 --- a/org.eclipse.mylyn.bugzilla.ui/build.properties +++ b/org.eclipse.mylyn.bugzilla.ui/build.properties @@ -15,7 +15,8 @@ bin.includes = META-INF/,\ docs/,\ about.html,\ toc.xml,\ - bugzilla_contexts.xml + bugzilla_contexts.xml,\ + doc/ jars.compile.order = bugzilla-ui.jar source.bugzilla-ui.jar = src/ output.bugzilla-ui.jar = bin/ @@ -26,4 +27,5 @@ src.includes = src/,\ docs/,\ icons/,\ toc.xml,\ - bugzilla_contexts.xml + bugzilla_contexts.xml,\ + doc/ 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 ce61597ae..e89a9a4aa 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,6 +13,7 @@ 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.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -27,7 +28,8 @@ import org.osgi.framework.BundleContext; public class MylarBugsPlugin extends AbstractUIPlugin { public static ImageDescriptor EDGE_REF_BUGZILLA = getImageDescriptor("icons/elcl16/edge-ref-bug.gif"); - private static BugzillaSearchManager bridge = null; + private BugzillaEditingMonitor bugzillaEditingMonitor; + private static BugzillaSearchManager bridge = null; private static BugzillaReferencesProvider referencesProvider = new BugzillaReferencesProvider(); private static MylarBugsPlugin plugin; private BugzillaReportCache cache; @@ -43,14 +45,19 @@ public class MylarBugsPlugin extends AbstractUIPlugin { super.start(context); cache = new BugzillaReportCache(); cache.readCacheFile(); - - MylarPlugin.getDefault().getSelectionMonitors().add(new BugzillaEditingMonitor()); IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); if (window != null) { // create a new bridge and initialize it bridge = new BugzillaSearchManager(); } + final IWorkbench workbench = PlatformUI.getWorkbench(); + workbench.getDisplay().asyncExec(new Runnable() { + public void run() { + bugzillaEditingMonitor = new BugzillaEditingMonitor(); + MylarPlugin.getDefault().getSelectionMonitors().add(bugzillaEditingMonitor); + } + }); } /** @@ -59,7 +66,7 @@ public class MylarBugsPlugin extends AbstractUIPlugin { public void stop(BundleContext context) throws Exception { super.stop(context); plugin = null; - + MylarPlugin.getDefault().getSelectionMonitors().remove(bugzillaEditingMonitor); // List<AbstractRelationshipProvider> providers = structureBridge.getProviders(); // if(providers != null){ // for(AbstractRelationshipProvider provider: providers){ |