Progress on: Bug 121041: Support more than one Bugzilla account per Workspace

https://bugs.eclipse.org/bugs/show_bug.cgi?id=121041

11 files changed, 86 insertions, 116 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java
index 28b834979..d24775cbe 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/BugzillaUiPlugin.java
@@ -10,21 +10,10 @@
  *******************************************************************************/
 package org.eclipse.mylar.bugzilla.ui;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.mylar.bugzilla.core.BugzillaPlugin;
-import org.eclipse.mylar.bugzilla.core.BugzillaPreferencePage;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaRefreshManager;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTaskListManager;
-import org.eclipse.mylar.core.util.MylarStatusHandler;
-import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
-import org.eclipse.mylar.tasklist.repositories.TaskRepository;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -52,41 +41,7 @@ public class BugzillaUiPlugin extends AbstractUIPlugin {
 		bugzillaRefreshManager = new BugzillaRefreshManager();
 		BugzillaPlugin.getDefault().addOfflineStatusListener(bugzillaTaskListManager);
 		
-		migrateDefaultAuthenticationData();
-	}
 
-	@SuppressWarnings("unchecked")
-	private void migrateDefaultAuthenticationData() {
-		String serverUrl = BugzillaPlugin.getDefault().getPreferenceStore().getString("BUGZILLA_SERVER");
-		String user = "";
-		String password = "";
-		Map<String, String> map = Platform.getAuthorizationInfo(BugzillaPreferencePage.FAKE_URL, "Bugzilla", BugzillaPreferencePage.AUTH_SCHEME);
-		
-		// get the information from the map and save it
-		if (map != null && !map.isEmpty()) {
-			String username = map.get(BugzillaPreferencePage.INFO_USERNAME);
-			if (username != null) user = username;
-			
-			String pwd = map.get(BugzillaPreferencePage.INFO_PASSWORD);
-			if (pwd != null) password = pwd;
-		}
-		
-		if (serverUrl != null && serverUrl.trim() != "") {
-			TaskRepository repository;
-			try {
-				repository = new TaskRepository(BugzillaPlugin.REPOSITORY_KIND, new URL(serverUrl));
-				repository.setAuthenticationCredentials(user, password);
-				MylarTaskListPlugin.getRepositoryManager().addRepository(repository);
-			} catch (MalformedURLException e) {
-				MylarStatusHandler.fail(e, "could not create default repository", true);
-			}
-		}
-		try {
-			// reset the authorization
-			Platform.addAuthorizationInfo(BugzillaPreferencePage.FAKE_URL, "Bugzilla", BugzillaPreferencePage.AUTH_SCHEME, new HashMap<String, String>());
-		} catch (CoreException e) {
-			// ignore
-		}
 	}
 
 	/**
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/AddBugzillaQueryAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/AddBugzillaQueryAction.java
index 225ebb2d4..96263b03c 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/AddBugzillaQueryAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/AddBugzillaQueryAction.java
@@ -26,6 +26,7 @@ import org.eclipse.mylar.core.util.MylarStatusHandler;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.MylarTaskListPrefConstants;
 import org.eclipse.mylar.tasklist.repositories.TaskRepository;
+import org.eclipse.mylar.tasklist.repositories.TaskRepositoryManager;
 import org.eclipse.mylar.tasklist.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IViewActionDelegate;
@@ -52,10 +53,10 @@ public class AddBugzillaQueryAction extends Action implements IViewActionDelegat
     public void run() {
     	BugzillaQueryDialog queryDialog = new BugzillaQueryDialog(Display.getCurrent().getActiveShell());
     	if(queryDialog.open() == Dialog.OK){
-    		TaskRepository repository = queryDialog.getTaskRepository();
+    		TaskRepository repository = queryDialog.getRepository();
     		if (repository == null) {
-				MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Client Information",
-						"No repository available, please add one.");
+				MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Mylar Bugzilla Client",
+						TaskRepositoryManager.MESSAGE_NO_REPOSITORY);
 				return;
     		}    		
     		
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/SynchronizeReportsAction.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/SynchronizeReportsAction.java
index 4cf41913a..207fea2a4 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/SynchronizeReportsAction.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/actions/SynchronizeReportsAction.java
@@ -41,9 +41,11 @@ import org.eclipse.ui.IViewPart;
  */
 public class SynchronizeReportsAction extends Action implements IViewActionDelegate {
 
+	private static final String LABEL_SYNCHRONIZE_JOB = "Bugzilla Query Refresh";
+
 	public static final String ID = "org.eclipse.mylar.tasklist.actions.refresh.bugzilla";
 
-	private BugzillaQueryCategory cat = null;
+	private BugzillaQueryCategory categoryToSynchronize = null;
 
 	public SynchronizeReportsAction() {
 		setText("Refresh Refresh");
@@ -55,7 +57,7 @@ public class SynchronizeReportsAction extends Action implements IViewActionDeleg
 	public SynchronizeReportsAction(BugzillaQueryCategory cat) {
 		this();
 		assert (cat != null);
-		this.cat = cat;
+		this.categoryToSynchronize = cat;
 	}
 
 	@Override
@@ -68,47 +70,14 @@ public class SynchronizeReportsAction extends Action implements IViewActionDeleg
 			return;
 		}
 
-//		Object obj = cat;
-		if (cat == null && TaskListView.getDefault() != null) {
+		if (categoryToSynchronize != null) {
+			synchronizeCategory(categoryToSynchronize);
+		} else if (TaskListView.getDefault() != null) {
 			ISelection selection = TaskListView.getDefault().getViewer().getSelection();
 			for (Object obj : ((IStructuredSelection) selection).toList()) {
 				if (obj instanceof BugzillaQueryCategory) {
-					final BugzillaQueryCategory cat = (BugzillaQueryCategory) obj;
-					Job j = new Job("Bugzilla Category Refresh") {
-
-						@Override
-						protected IStatus run(IProgressMonitor monitor) {
-							cat.refreshBugs();
-							for (IQueryHit hit : cat.getHits()) {
-								if (hit.getCorrespondingTask() != null && hit instanceof BugzillaHit) {
-									BugzillaUiPlugin.getDefault().getBugzillaRefreshManager().requestRefresh(
-											(BugzillaTask) hit.getCorrespondingTask());
-								}
-							}
-							Display.getDefault().asyncExec(new Runnable() {
-								public void run() {
-									if (TaskListView.getDefault() != null)
-										TaskListView.getDefault().getViewer().refresh();
-								}
-							});
-							return Status.OK_STATUS;
-						}
-
-					};
-
-					j.schedule();
-					// // Use the progess service to execute the runnable
-					// IProgressService service =
-					// PlatformUI.getWorkbench().getProgressService();
-					// try {
-					// service.run(true, false, op);
-					// } catch (InvocationTargetException e) {
-					// // Operation was canceled
-					// MylarPlugin.log(e, e.getMessage());
-					// } catch (InterruptedException e) {
-					// // Handle the wrapped exception
-					// MylarPlugin.log(e, e.getMessage());
-					// }
+					BugzillaQueryCategory currCategory = (BugzillaQueryCategory) obj;
+					synchronizeCategory(currCategory);
 				} else if (obj instanceof TaskCategory) {
 					TaskCategory cat = (TaskCategory) obj;
 					for (ITask task : cat.getChildren()) {
@@ -152,6 +121,32 @@ public class SynchronizeReportsAction extends Action implements IViewActionDeleg
 		});
 	}
 
+	private void synchronizeCategory(final BugzillaQueryCategory cat) {
+		Job j = new Job(LABEL_SYNCHRONIZE_JOB) {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				cat.refreshBugs();
+				for (IQueryHit hit : cat.getHits()) {
+					if (hit.getCorrespondingTask() != null && hit instanceof BugzillaHit) {
+						BugzillaUiPlugin.getDefault().getBugzillaRefreshManager().requestRefresh(
+								(BugzillaTask) hit.getCorrespondingTask());
+					}
+				}
+				Display.getDefault().asyncExec(new Runnable() {
+					public void run() {
+						if (TaskListView.getDefault() != null)
+							TaskListView.getDefault().getViewer().refresh();
+					}
+				});
+				return Status.OK_STATUS;
+			}
+
+		};
+
+		j.schedule();
+	}
+
 	public void init(IViewPart view) {
 
 	}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
index b03fd1289..96cc56a48 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/editor/ExistingBugEditor.java
@@ -139,14 +139,14 @@ public class ExistingBugEditor extends AbstractBugEditor {
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		if (!(input instanceof ExistingBugEditorInput))
 			throw new PartInitException("Invalid Input: Must be ExistingBugEditorInput");
-		ExistingBugEditorInput ei = (ExistingBugEditorInput) input;
-		repository = ei.getRepository();
+		ExistingBugEditorInput editorInput = (ExistingBugEditorInput) input;
+		repository = editorInput.getRepository();
 		
 		setSite(site);
 		setInput(input);
-		bugzillaInput = ei;
+		bugzillaInput = editorInput;
 		model = BugzillaOutlineNode.parseBugReport(bugzillaInput.getBug());
-		bug = ei.getBug();
+		bug = editorInput.getBug();
 		restoreBug();
 		isDirty = false;
 		updateEditorTitle();
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java
index 5060d6e44..c162f38ca 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/search/BugzillaSearchPage.java
@@ -36,6 +36,7 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaUITools;
 import org.eclipse.mylar.core.util.MylarStatusHandler;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.repositories.TaskRepository;
+import org.eclipse.mylar.tasklist.repositories.TaskRepositoryManager;
 import org.eclipse.search.ui.ISearchPage;
 import org.eclipse.search.ui.ISearchPageContainer;
 import org.eclipse.search.ui.NewSearchUI;
@@ -758,8 +759,8 @@ public class BugzillaSearchPage extends DialogPage implements ISearchPage {
 				if (repository != null) {
 					updateAttributesFromRepository(repository.getUrl().toExternalForm(), true);
 				} else {
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Client Information",
-						"No repository available, please add one.");
+					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), IBugzillaConstants.TITLE_MESSAGE_DIALOG,
+							TaskRepositoryManager.MESSAGE_NO_REPOSITORY);
 				}
 			}
 		});
@@ -780,8 +781,8 @@ public class BugzillaSearchPage extends DialogPage implements ISearchPage {
 
 	public boolean performAction() {
 		if (repository == null) {
-			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Client Information",
-					"No repository available, please add one.");
+			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), IBugzillaConstants.TITLE_MESSAGE_DIALOG,
+					TaskRepositoryManager.MESSAGE_NO_REPOSITORY);
 			return false;
 		}
 
@@ -874,8 +875,8 @@ public class BugzillaSearchPage extends DialogPage implements ISearchPage {
 				}
 				repositoryCombo.setItems(repositoryUrls);
 				if (repositoryUrls.length == 0) {
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Client Information",
-						"No repository available, please add one.");
+					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), IBugzillaConstants.TITLE_MESSAGE_DIALOG,
+							TaskRepositoryManager.MESSAGE_NO_REPOSITORY);
 				} else {
 					repositoryCombo.select(indexToSelect);
 					updateAttributesFromRepository(repositoryCombo.getItem(indexToSelect), false);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java
index 280b1e316..88e3fe883 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaHit.java
@@ -184,7 +184,7 @@ public class BugzillaHit implements IQueryHit {
 		return getId() + "";
 	}
 
-	public void setHandle(String id) {
+	public void setHandleIdentifier(String id) {
 		// can't change the handle
 	}
 
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
index 279b852da..d121fc627 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryCategory.java
@@ -31,7 +31,6 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaImages;
 import org.eclipse.mylar.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.bugzilla.ui.search.BugzillaResultCollector;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaCategorySearchOperation.ICategorySearchListener;
-import org.eclipse.mylar.core.util.MylarStatusHandler;
 import org.eclipse.mylar.tasklist.IQueryHit;
 import org.eclipse.mylar.tasklist.ITaskQuery;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
@@ -43,6 +42,7 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.Workbench;
 
 /**
  * @author Shawn Minto
@@ -151,7 +151,14 @@ public class BugzillaQueryCategory implements ITaskQuery {
 
 		TaskRepository repository = MylarTaskListPlugin.getRepositoryManager().getRepository(BugzillaPlugin.REPOSITORY_KIND, repositoryUrl);
 		if (repository == null) {
-			MylarStatusHandler.fail(null, "could not find repository for url: " + repositoryUrl, true);
+            Workbench.getInstance().getDisplay().asyncExec(new Runnable() {
+                public void run() {
+                	MessageDialog.openInformation(
+        					Display.getDefault().getActiveShell(), IBugzillaConstants.TITLE_MESSAGE_DIALOG,
+        					"No task repository associated with this query. Open the query to associate it with a repository.");  
+                }
+            });
+//			MylarStatusHandler.fail(null, "could not find repository for url: " + repositoryUrl, true);
 		} else {
 			final BugzillaCategorySearchOperation catSearch = new BugzillaCategorySearchOperation(
 					repository, getQueryUrl(), maxHits);
@@ -277,7 +284,7 @@ public class BugzillaQueryCategory implements ITaskQuery {
 		return getDescription(true);
 	}
 
-	public void setHandle(String id) {
+	public void setHandleIdentifier(String id) {
 		this.handle = id;
 	}
 
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryDialog.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryDialog.java
index 1d0b57a85..7f2528e41 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryDialog.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaQueryDialog.java
@@ -23,9 +23,11 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.mylar.bugzilla.core.BugzillaPlugin;
+import org.eclipse.mylar.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylar.bugzilla.ui.search.BugzillaSearchPage;
 import org.eclipse.mylar.tasklist.MylarTaskListPlugin;
 import org.eclipse.mylar.tasklist.repositories.TaskRepository;
+import org.eclipse.mylar.tasklist.repositories.TaskRepositoryManager;
 import org.eclipse.search.ui.ISearchPageContainer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -181,13 +183,13 @@ public class BugzillaQueryDialog extends Dialog {
 	protected void okPressed() {
 		TaskRepository repository = searchOptionPage.getRepository();
 		if (repository == null) {
-			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Client Information",
-					"No repository available, please add one.");
+			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), IBugzillaConstants.TITLE_MESSAGE_DIALOG,
+					TaskRepositoryManager.MESSAGE_NO_REPOSITORY);
 			return;
 		}
 		if (repository == null) {
-			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Bugzilla Client Information",
-					"No repository available, please add one.");
+			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), IBugzillaConstants.TITLE_MESSAGE_DIALOG,
+					TaskRepositoryManager.MESSAGE_NO_REPOSITORY);
 			return;
 		}
 
@@ -266,6 +268,9 @@ public class BugzillaQueryDialog extends Dialog {
 			};
 		}
 
+		/** 
+		 * TODO: get rid of this?
+		 */
 		public void updateDefaults(String startingUrl, String maxHits) throws UnsupportedEncodingException {
 			// String serverName = startingUrl.substring(0,
 			// startingUrl.indexOf("?"));
@@ -480,7 +485,7 @@ public class BugzillaQueryDialog extends Dialog {
 		}
 	}
 
-	public TaskRepository getTaskRepository() {
+	public TaskRepository getRepository() {
 		return searchOptionPage.getRepository();
 	}
 }
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java
index 5c8106e2b..eaddabbc3 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTask.java
@@ -144,7 +144,8 @@ public class BugzillaTask extends Task {
 
 	private void initFromHandle() {
 		int id = TaskRepositoryManager.getTaskIdAsInt(getHandleIdentifier());
-		repositoryUrl = TaskRepositoryManager.getRepositoryUrl(getHandleIdentifier());
+		String repositoryUrl = getRepositoryUrl();
+//		repositoryUrl = TaskRepositoryManager.getRepositoryUrl(getHandleIdentifier());
 //		System.err.println(">>> handle: " + getHandleIdentifier());
 		if (repositoryUrl != null) {
 			String url = BugzillaRepositoryUtil.getBugUrlWithoutLogin(repositoryUrl, id);
@@ -256,7 +257,7 @@ public class BugzillaTask extends Task {
 						+ " due to bugzilla core not existing", this);
 				return null;
 			}
-			return BugzillaRepositoryUtil.getBug(repositoryUrl, TaskRepositoryManager
+			return BugzillaRepositoryUtil.getBug(getRepositoryUrl(), TaskRepositoryManager
 					.getTaskIdAsInt(getHandleIdentifier()));
 		} catch (LoginException e) {
 			Workbench.getInstance().getDisplay().asyncExec(new Runnable() {
@@ -579,12 +580,16 @@ public class BugzillaTask extends Task {
 		}
 	}
 
+	public String getRepositoryUrl() {
+		return TaskRepositoryManager.getRepositoryUrl(getHandleIdentifier());
+	}
+	
 	@Override
 	public String getUrl() {
 		// fix for bug 103537 - should login automatically, but dont want to
 		// show the login info in the query string
 		return BugzillaRepositoryUtil
-				.getBugUrlWithoutLogin(repositoryUrl, TaskRepositoryManager.getTaskIdAsInt(handle));
+				.getBugUrlWithoutLogin(getRepositoryUrl(), TaskRepositoryManager.getTaskIdAsInt(handle));
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java
index 2dd672953..aeebbb046 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskHandler.java
@@ -90,20 +90,22 @@ public class BugzillaTaskHandler implements ITaskHandler {
 			}
 		} else if (element instanceof BugzillaQueryCategory) {
 			BugzillaQueryCategory queryCategory = (BugzillaQueryCategory) element;
-			BugzillaQueryDialog sqd = new BugzillaQueryDialog(
+			BugzillaQueryDialog queryDialog = new BugzillaQueryDialog(
 					Display.getCurrent().getActiveShell(), 
 					queryCategory.getRepositoryUrl(),
 					queryCategory.getQueryUrl(), queryCategory.getDescription(false), queryCategory.getMaxHits() + "");
-			if (sqd.open() == Dialog.OK) {
-				queryCategory.setDescription(sqd.getName());
-				queryCategory.setQueryUrl(sqd.getUrl());
+			if (queryDialog.open() == Dialog.OK) {
+				queryCategory.setDescription(queryDialog.getName());
+				queryCategory.setQueryUrl(queryDialog.getUrl());
+				queryCategory.setRepositoryUrl(queryDialog.getRepository().getUrl().toExternalForm());
 				int maxHits = -1;
 				try {
-					maxHits = Integer.parseInt(sqd.getMaxHits());
+					maxHits = Integer.parseInt(queryDialog.getMaxHits());
 				} catch (Exception e) {
 				}
 				queryCategory.setMaxHits(maxHits);
 
+				System.err.println(">>> syncrhonizing");
 				new SynchronizeReportsAction(queryCategory).run();
 			}
 		} else if (element instanceof BugzillaHit) {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java
index f5c6291e2..0c8015ea8 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/wizard/WizardProductPage.java
@@ -130,7 +130,6 @@ public class WizardProductPage extends AbstractWizardListPage {
 			String repositoryUrl = bugWizard.getRepository().getUrl().toExternalForm();
 			try {
 //				ProductConfiguration productConfiguration = BugzillaPlugin.getDefault().getProductConfiguration(repositoryUrl);
-//				System.err.println(">>>>> stored config: " + productConfiguration);
 				String[] storedProducts = BugzillaRepositoryUtil.getQueryOptions(IBugzillaConstants.VALUES_PRODUCT,
 						repositoryUrl);
 				if (storedProducts.length > 0) {