Minor bugfixes, cleanup

- prevent npe, when there is no repository for the project
- when retrieving all repositories for a task avoid duplicate
repositories
- deleted unused file
- refactored changeset part

Change-Id: I9e8330c9a8568100a9610bf8df48147931f4c7b0

4 files changed, 73 insertions, 62 deletions

diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/EclipsePluginConfiguration.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/EclipsePluginConfiguration.java
index 13c848d2e..cd2788713 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/EclipsePluginConfiguration.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/EclipsePluginConfiguration.java
@@ -32,7 +32,8 @@ public class EclipsePluginConfiguration implements IConfiguration {
 				.getProjects()) {
 			TaskRepository repo = TasksUiPlugin.getDefault()
 					.getRepositoryForResource(project);
-			if (connectorKind.equals(repo.getConnectorKind())
+			
+			if (repo!=null && connectorKind.equals(repo.getConnectorKind())
 					&& repositoryUrl.equals(repo.getRepositoryUrl())) {
 				projects.add(project);
 			}
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java
index b9900d051..6c3d230b6 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.mapper.generic/src/org/eclipse/mylyn/versions/tasks/mapper/generic/GenericTaskChangesetMapper.java
@@ -11,7 +11,9 @@
 package org.eclipse.mylyn.versions.tasks.mapper.generic;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -72,7 +74,7 @@ public class GenericTaskChangesetMapper extends
 	private List<ScmRepository> getRepositoriesFor(ITask task)
 			throws CoreException {
 
-		List<ScmRepository> repos = new ArrayList<ScmRepository>();
+		Set<ScmRepository> repos = new HashSet<ScmRepository>();
 
 		List<IProject> projects = configuration.getProjectsForTaskRepository(
 				task.getConnectorKind(), task.getRepositoryUrl());
@@ -80,7 +82,7 @@ public class GenericTaskChangesetMapper extends
 			ScmRepository repository = getRepositoryForProject(p);
 			repos.add(repository);
 		}
-		return repos;
+		return new ArrayList<ScmRepository>(repos);
 	}
 
 	private ScmRepository getRepositoryForProject(IProject p)
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java
index 3272ccca1..b1787d9bf 100644
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java
+++ b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/ChangesetPart.java
@@ -15,7 +15,6 @@ import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.ContributionManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
@@ -33,6 +32,7 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
@@ -43,6 +43,41 @@ import org.eclipse.ui.forms.widgets.Section;
  */
 @SuppressWarnings("restriction")
 public class ChangesetPart extends AbstractTaskEditorPart {
+	private static final class TaskChangesetLabelProvider implements
+			ITableLabelProvider {
+		public void addListener(ILabelProviderListener listener) {
+		}
+
+		public void dispose() {
+		}
+
+		public boolean isLabelProperty(Object element, String property) {
+			return false;
+		}
+
+		public void removeListener(ILabelProviderListener listener) {
+		}
+
+		public Image getColumnImage(Object element, int columnIndex) {
+			return null;
+		}
+
+		public String getColumnText(Object element, int columnIndex) {
+			TaskChangeSet cs = ((TaskChangeSet) element);
+			switch (columnIndex) {
+			case 0:
+				return cs.getChangeset().getId();
+			case 1:
+				return cs.getChangeset().getMessage();
+			case 2:
+				return cs.getChangeset().getAuthor().getEmail();
+			case 3:
+				return cs.getChangeset().getDate().toString();
+			}
+			return element.toString() + " " + columnIndex;
+		}
+	}
+
 	public ChangesetPart() {
 		setPartName("Changeset");
 		setExpandVertically(true);
@@ -50,6 +85,21 @@ public class ChangesetPart extends AbstractTaskEditorPart {
 
 	@Override
 	public void createControl(Composite parent, FormToolkit toolkit) {
+		Section createSection = createSection(parent, toolkit);
+		Composite composite = createContentComposite(toolkit, createSection);
+		
+		createTable(composite);
+	}
+
+	private Composite createContentComposite(FormToolkit toolkit,
+			Section createSection) {
+		Composite composite = toolkit.createComposite(createSection);
+		createSection.setClient(composite);
+		composite.setLayout(new FillLayout());
+		return composite;
+	}
+
+	private Section createSection(Composite parent, FormToolkit toolkit) {
 		Section createSection = createSection(parent, toolkit, true);
 		createSection.setText("Changesets");
 		setSection(toolkit, createSection);
@@ -59,71 +109,33 @@ public class ChangesetPart extends AbstractTaskEditorPart {
 		gd.horizontalSpan = 4;
 		createSection.setLayout(gl);
 		createSection.setLayoutData(gd);
-		Composite composite = toolkit.createComposite(createSection);
-		createSection.setClient(composite);
-		composite.setLayout(new FillLayout());
+		return createSection;
+	}
 
+	private void createTable(Composite composite) {
 		TableViewer table = new TableViewer(composite);
 		table.getTable().setLinesVisible(true);
 		table.getTable().setHeaderVisible(true);
-		TableViewerColumn tableViewerColumn = new TableViewerColumn(table,
-				SWT.LEFT);
-		tableViewerColumn.getColumn().setText("Id");
-		tableViewerColumn.getColumn().setWidth(100);
-		tableViewerColumn = new TableViewerColumn(table, SWT.LEFT);
-		tableViewerColumn.getColumn().setText("Message");
-		tableViewerColumn.getColumn().setWidth(100);
-		tableViewerColumn = new TableViewerColumn(table, SWT.LEFT);
-		tableViewerColumn.getColumn().setText("Author");
-		tableViewerColumn.getColumn().setWidth(100);
-		tableViewerColumn = new TableViewerColumn(table, SWT.LEFT);
-		tableViewerColumn.getColumn().setText("Date");
-		tableViewerColumn.getColumn().setWidth(100);
+		addColumn(table, "Id");
+		addColumn(table, "Message");
+		addColumn(table, "Author");
+		addColumn(table, "Date");
 		table.setContentProvider(ArrayContentProvider.getInstance());
-		table.setLabelProvider(new ITableLabelProvider() {
-
-			public void addListener(ILabelProviderListener listener) {
-			}
-
-			public void dispose() {
-			}
-
-			public boolean isLabelProperty(Object element, String property) {
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener) {
-			}
-
-			public Image getColumnImage(Object element, int columnIndex) {
-				return null;
-			}
-
-			public String getColumnText(Object element, int columnIndex) {
-				TaskChangeSet cs = ((TaskChangeSet) element);
-				switch (columnIndex) {
-				case 0:
-					return cs.getChangeset().getId();
-				case 1:
-					return cs.getChangeset().getMessage();
-				case 2:
-					return cs.getChangeset().getAuthor().getEmail();
-				case 3:
-					return cs.getChangeset().getDate().toString();
-				}
-				return element.toString() + " " + columnIndex;
-			}
-		});
+		table.setLabelProvider(new TaskChangesetLabelProvider());
 		table.setInput(getInput());
 		MenuManager menuManager = new MenuManager();
 		menuManager.setRemoveAllWhenShown(true);
 		getTaskEditorPage().getEditorSite().registerContextMenu(
-				"org.eclipse.mylyn.versions.changesets", menuManager, table,
-				true);
-		org.eclipse.swt.widgets.Menu menu = menuManager.createContextMenu(table
-				.getControl());
+				"org.eclipse.mylyn.versions.changesets", menuManager, table, true);
+		Menu menu = menuManager.createContextMenu(table.getControl());
 		table.getTable().setMenu(menu);
+	}
 
+	private void addColumn(TableViewer table, String name) {
+		TableViewerColumn tableViewerColumn = new TableViewerColumn(table,
+				SWT.LEFT);
+		tableViewerColumn.getColumn().setText(name);
+		tableViewerColumn.getColumn().setWidth(100);
 	}
 
 	private List<TaskChangeSet> getInput() {
diff --git a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/IChangeSets.java b/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/IChangeSets.java
deleted file mode 100644
index 5423d5bde..000000000
--- a/tbr/org.eclipse.mylyn.versions.tasks.ui/src/org/eclipse/mylyn/versions/tasks/ui/IChangeSets.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.eclipse.mylyn.versions.tasks.ui;
-public class IChangeSets {
-	
-}