Progress on: Bug 120952: provide task/issue repository view and extension points

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

3 files changed, 72 insertions, 21 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 c4c99a9b1..3a7a734de 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
@@ -19,33 +19,59 @@ import org.osgi.framework.BundleContext;
 
 /**
  * The main plugin class to be used in the desktop.
+ * 
+ * @author Mik Kersten (hardening of prototype)
  */
 public class BugzillaUiPlugin extends AbstractUIPlugin {
 
 	private BugzillaTaskListManager bugzillaTaskListManager;
+
 	private BugzillaRefreshManager bugzillaRefreshManager;
-	
-    private static BugzillaUiPlugin plugin;
-		
-	
-	/**
-	 * The constructor.
-	 */
+
+	private static BugzillaUiPlugin plugin;
+
 	public BugzillaUiPlugin() {
 		plugin = this;
 	}
-	
-	/**
-	 * This method is called upon plug-in activation
-	 */
+
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		BugzillaPlugin.setResultEditorMatchAdapter(new BugzillaResultMatchAdapter());
 		bugzillaTaskListManager = new BugzillaTaskListManager();
 		bugzillaRefreshManager = new BugzillaRefreshManager();
 		BugzillaPlugin.getDefault().addOfflineStatusListener(bugzillaTaskListManager);
+		
+//		migrateDefaultAuthenticationData();
 	}
 
+//	@SuppressWarnings("unchecked")
+//	private void migrateDefaultAuthenticationData() {
+//		String serverUrl = BugzillaPlugin.getDefault().getPreferenceStore().getString(IBugzillaConstants.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) {
+//			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(new URL(serverUrl));
+//				repository.setAuthenticationCredentials(user, password);
+//				MylarTaskListPlugin.getRepositoryManager().addRepository(repository);
+//			} catch (MalformedURLException e) {
+//				ErrorLogger.fail(e, "could not create default repository", true);
+//			}
+//		}
+//	}
+
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
@@ -63,25 +89,26 @@ public class BugzillaUiPlugin extends AbstractUIPlugin {
 	}
 
 	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
+	 * Returns an image descriptor for the image file at the given plug-in
+	 * relative path.
+	 * 
+	 * @param path
+	 *            the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
 		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.mylar.bugzilla.ui", path);
 	}
-	
+
 	public BugzillaTaskListManager getBugzillaTaskListManager() {
 		return bugzillaTaskListManager;
 	}
-	
+
 	public BugzillaRefreshManager getBugzillaRefreshManager() {
 		return bugzillaRefreshManager;
 	}
-	
+
 	public String createBugHandleIdentifier(int bugId) {
-		return "Bugzilla-"+bugId;
+		return "Bugzilla-" + bugId;
 	}
 }
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 d0d5403ae..ca96d7cd0 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
@@ -156,8 +156,8 @@ public class BugzillaSearchPage extends DialogPage implements ISearchPage {
 		GridData gd = new GridData(GridData.FILL_BOTH);
 		control.setLayoutData(gd);
 
-		createTextSearchComposite(control);
-		createComment(control);
+		createRepositoryGroup(control);
+		createSearchGroup(control);
 		createOptionsGroup(control);
 
 		createEmail(control);
@@ -171,6 +171,24 @@ public class BugzillaSearchPage extends DialogPage implements ISearchPage {
 		WorkbenchHelpSystem.getInstance().setHelp(control, IBugzillaConstants.SEARCH_PAGE_CONTEXT);
 	}
 
+	private void createRepositoryGroup(Composite control) {
+//		String[] repositories = 
+		
+	}
+
+	private void createSearchGroup(Composite control) {
+		Group group = new Group(control, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 1;
+		group.setLayout(layout);
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 5;
+		group.setLayoutData(gd);
+		
+		createTextSearchComposite(group);
+		createComment(group); 
+	}
+
 	protected Control createTextSearchComposite(Composite control) {
 		GridData gd;
 		Label label;
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java
index cf133f462..f967f1dc3 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/bugzilla/ui/tasklist/BugzillaTaskRepositoryClient.java
@@ -20,6 +20,8 @@ import org.eclipse.mylar.tasklist.ui.wizards.RepositorySettingsPage;
  */
 public class BugzillaTaskRepositoryClient implements ITaskRepositoryClient {
 
+	public static final String KIND = "bugzilla";
+	
 	public String getLabel() {
 		return "Bugzilla Client (supports uncustomized 2.16-2.20)";
 	}
@@ -32,4 +34,8 @@ public class BugzillaTaskRepositoryClient implements ITaskRepositoryClient {
 		return new RepositorySettingsPage();
 	}
 
+	public String getKind() {
+		return KIND;
+	}
+
 }