Refactor package and class names for issue connector.

Change-Id: Icfaf402936f0ebd2527ac9ba2fbbeb135a58e5c4
Signed-off-by: Kevin Sawicki <kevin@github.com>

17 files changed, 242 insertions, 208 deletions

diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java
deleted file mode 100644
index 59617861..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/Messages.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011 GitHub Inc.
- *  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:
- *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * NLS for Mylyn GitHub Core
- */
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.github.internal.messages"; //$NON-NLS-1$
-
-	/** */
-	public static String FieldError_InvalidField;
-
-	/** */
-	public static String FieldError_InvalidFieldWithValue;
-
-	/** */
-	public static String FieldError_MissingField;
-
-	/** */
-	public static String FieldError_ResourceError;
-
-	/** */
-	public static String GitHubRepositoryConnector_LabelConnector;
-
-	/** */
-	public static String GitHubRepositoryConnector_TaskQuerying;
-
-	/** */
-	public static String GitHubRepositoryConnector_TaskUpdatingLabels;
-
-	/** */
-	public static String GitHubRepositoryConnector_TaskUpdatingMilestones;
-
-	/** */
-	public static String GitHubTaskAttributes_LabekSummary;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelAssignee;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelAssigneeGravatar;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelClosed;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelComment;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelCreated;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelDescription;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelKey;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelLabels;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelMilestone;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelModified;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelReporter;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelReporterGravatar;
-
-	/** */
-	public static String GitHubTaskAttributes_LabelStatus;
-
-	/** */
-	public static String GitHubTaskDataHandler_MilestoneNone;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties
deleted file mode 100644
index 77706e84..00000000
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-FieldError_InvalidField=Invalid value for field {1}
-FieldError_InvalidFieldWithValue=Invalid value of {0} for field {1}
-FieldError_MissingField=Missing required field {0}
-FieldError_ResourceError=Error with field {0} in {1} resource
-GitHubRepositoryConnector_LabelConnector=GitHub Issues
-GitHubRepositoryConnector_TaskQuerying=Querying repository...
-GitHubRepositoryConnector_TaskUpdatingLabels=Updating labels
-GitHubRepositoryConnector_TaskUpdatingMilestones=Updating milestones
-GitHubTaskAttributes_LabekSummary=Summary
-GitHubTaskAttributes_LabelAssignee=Assignee:
-GitHubTaskAttributes_LabelAssigneeGravatar=Assignee
-GitHubTaskAttributes_LabelClosed=Closed:
-GitHubTaskAttributes_LabelComment=Comment:
-GitHubTaskAttributes_LabelCreated=Created:
-GitHubTaskAttributes_LabelDescription=Description
-GitHubTaskAttributes_LabelKey=Key
-GitHubTaskAttributes_LabelLabels=Labels:
-GitHubTaskAttributes_LabelMilestone=Milestone:
-GitHubTaskAttributes_LabelModified=Modified:
-GitHubTaskAttributes_LabelReporter=Reporter:
-GitHubTaskAttributes_LabelReporterGravatar=Reporter
-GitHubTaskAttributes_LabelStatus=Status:
-GitHubTaskDataHandler_MilestoneNone=None
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHub.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java
index cf2e1330..6206ad0f 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHub.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHub.java
@@ -10,7 +10,7 @@
  *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
  *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core;
 
 import java.util.regex.Pattern;
 
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubException.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java
index 6ff1a908..a0a58cf7 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubException.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java
@@ -8,7 +8,7 @@
  *  Contributors:
  *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core;
 
 import java.io.IOException;
 import java.text.MessageFormat;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java
new file mode 100644
index 00000000..0c8858bf
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/Messages.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  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:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * NLS for Mylyn GitHub Core
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.github.core.messages"; //$NON-NLS-1$
+
+	/** */
+	public static String FieldError_InvalidField;
+
+	/** */
+	public static String FieldError_InvalidFieldWithValue;
+
+	/** */
+	public static String FieldError_MissingField;
+
+	/** */
+	public static String FieldError_ResourceError;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/QueryUtils.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/QueryUtils.java
index c2496f3d..85728004 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/QueryUtils.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/QueryUtils.java
@@ -8,7 +8,7 @@
  *  Contributors:
  *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java
index 172c9332..09609f7e 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistAttachmentHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.egit.github.core.client.GitHubRequest;
 import org.eclipse.egit.github.core.service.GistService;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.data.AbstractTaskAttachmentHandler;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java
index fe3760bc..f92c6d1a 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistConnector.java
@@ -22,7 +22,7 @@ import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.GistService;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHub;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.ITask;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java
index a09539e9..e68a2900 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/gist/GistTaskDataHandler.java
@@ -27,8 +27,8 @@ import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.GistService;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.github.internal.GitHub;
-import org.eclipse.mylyn.github.internal.GitHubTaskAttributeMapper;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.issue.IssueAttributeMapper;
 import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
 import org.eclipse.mylyn.tasks.core.ITaskMapping;
 import org.eclipse.mylyn.tasks.core.RepositoryResponse;
@@ -274,7 +274,7 @@ public class GistTaskDataHandler extends AbstractTaskDataHandler {
 	 * @see org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler#getAttributeMapper(org.eclipse.mylyn.tasks.core.TaskRepository)
 	 */
 	public TaskAttributeMapper getAttributeMapper(TaskRepository taskRepository) {
-		return new GitHubTaskAttributeMapper(taskRepository);
+		return new IssueAttributeMapper(taskRepository);
 	}
 
 }
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributes.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttribute.java
index 1b6cd3b9..8c97c965 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributes.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttribute.java
@@ -10,104 +10,104 @@
  *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
  *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core.issue;
 
 import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 
 /**
  * GitHub issue task attributes
  */
-public enum GitHubTaskAttributes {
+public enum IssueAttribute {
 
 	/**
 	 * Issue key
 	 */
-	KEY(Messages.GitHubTaskAttributes_LabelKey, TaskAttribute.TASK_KEY,
+	KEY(Messages.IssueAttribute_LabelKey, TaskAttribute.TASK_KEY,
 			TaskAttribute.TYPE_SHORT_TEXT, true, true),
 
 	/**
 	 * Issue title
 	 */
-	TITLE(Messages.GitHubTaskAttributes_LabekSummary, TaskAttribute.SUMMARY,
+	TITLE(Messages.IssueAttribute_LabekSummary, TaskAttribute.SUMMARY,
 			TaskAttribute.TYPE_SHORT_RICH_TEXT, false, true),
 
 	/**
 	 * Issue description
 	 */
-	BODY(Messages.GitHubTaskAttributes_LabelDescription,
+	BODY(Messages.IssueAttribute_LabelDescription,
 			TaskAttribute.DESCRIPTION, TaskAttribute.TYPE_LONG_RICH_TEXT,
 			false, true),
 
 	/**
 	 * Issue creation date
 	 */
-	CREATION_DATE(Messages.GitHubTaskAttributes_LabelCreated,
+	CREATION_DATE(Messages.IssueAttribute_LabelCreated,
 			TaskAttribute.DATE_CREATION, TaskAttribute.TYPE_DATETIME, true,
 			false),
 
 	/**
 	 * Issue modification date
 	 */
-	MODIFICATION_DATE(Messages.GitHubTaskAttributes_LabelModified,
+	MODIFICATION_DATE(Messages.IssueAttribute_LabelModified,
 			TaskAttribute.DATE_MODIFICATION, TaskAttribute.TYPE_DATETIME, true,
 			false),
 
 	/**
 	 * Issue closed date
 	 */
-	CLOSED_DATE(Messages.GitHubTaskAttributes_LabelClosed,
+	CLOSED_DATE(Messages.IssueAttribute_LabelClosed,
 			TaskAttribute.DATE_COMPLETION, TaskAttribute.TYPE_DATETIME, true,
 			false),
 
 	/**
 	 * Issue status
 	 */
-	STATUS(Messages.GitHubTaskAttributes_LabelStatus, TaskAttribute.STATUS,
+	STATUS(Messages.IssueAttribute_LabelStatus, TaskAttribute.STATUS,
 			TaskAttribute.TYPE_SHORT_TEXT, false, true),
 
 	/**
 	 * Issue reporter
 	 */
-	REPORTER(Messages.GitHubTaskAttributes_LabelReporter,
+	REPORTER(Messages.IssueAttribute_LabelReporter,
 			TaskAttribute.USER_REPORTER, TaskAttribute.TYPE_PERSON, true, false),
 
 	/**
 	 * Comment being added to issue
 	 */
-	COMMENT_NEW(Messages.GitHubTaskAttributes_LabelComment,
+	COMMENT_NEW(Messages.IssueAttribute_LabelComment,
 			TaskAttribute.COMMENT_NEW, TaskAttribute.TYPE_LONG_RICH_TEXT,
 			false, false),
 
 	/**
 	 * Labels applied to issue
 	 */
-	LABELS(Messages.GitHubTaskAttributes_LabelLabels, "github.issue.labels", //$NON-NLS-1$
+	LABELS(Messages.IssueAttribute_LabelLabels, "github.issue.labels", //$NON-NLS-1$
 			TaskAttribute.TYPE_MULTI_SELECT, true, false),
 
 	/**
 	 * Issue assignee
 	 */
-	ASSIGNEE(Messages.GitHubTaskAttributes_LabelAssignee,
+	ASSIGNEE(Messages.IssueAttribute_LabelAssignee,
 			TaskAttribute.USER_ASSIGNED, TaskAttribute.TYPE_PERSON, false, true),
 
 	/**
 	 * Issue milestone
 	 */
-	MILESTONE(Messages.GitHubTaskAttributes_LabelMilestone,
+	MILESTONE(Messages.IssueAttribute_LabelMilestone,
 			"github.issue.milestone", TaskAttribute.TYPE_SINGLE_SELECT, //$NON-NLS-1$
 			false, true),
 
 	/**
 	 * Issue assignee gravatar
 	 */
-	ASSIGNEE_GRAVATAR(Messages.GitHubTaskAttributes_LabelAssigneeGravatar,
+	ASSIGNEE_GRAVATAR(Messages.IssueAttribute_LabelAssigneeGravatar,
 			"github.issue.assignee.gravatar", TaskAttribute.TYPE_URL, null, //$NON-NLS-1$
 			true, false),
 
 	/**
 	 * Issue reporter gravatar
 	 */
-	REPORTER_GRAVATAR(Messages.GitHubTaskAttributes_LabelReporterGravatar,
+	REPORTER_GRAVATAR(Messages.IssueAttribute_LabelReporterGravatar,
 			"github.issue.reporter.gravatar", TaskAttribute.TYPE_URL, null, //$NON-NLS-1$
 			true, false);
 
@@ -118,12 +118,12 @@ public enum GitHubTaskAttributes {
 	private final boolean initTask;
 	private final String type;
 
-	private GitHubTaskAttributes(String label, String id, String type,
+	private IssueAttribute(String label, String id, String type,
 			boolean readOnly, boolean initTask) {
 		this(label, id, type, TaskAttribute.KIND_DEFAULT, readOnly, initTask);
 	}
 
-	private GitHubTaskAttributes(String label, String id, String type,
+	private IssueAttribute(String label, String id, String type,
 			String kind, boolean readOnly, boolean initTask) {
 		this.label = label;
 		this.id = id;
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributeMapper.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttributeMapper.java
index 776ffc05..e4038af7 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskAttributeMapper.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueAttributeMapper.java
@@ -10,7 +10,7 @@
  *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
  *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core.issue;
 
 import java.text.DateFormat;
 import java.util.Collections;
@@ -24,7 +24,7 @@ import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
 /**
  * GitHub task attribute mapper class.
  */
-public class GitHubTaskAttributeMapper extends TaskAttributeMapper {
+public class IssueAttributeMapper extends TaskAttributeMapper {
 
 	private DateFormat format = DateFormat.getDateTimeInstance(
 			DateFormat.MEDIUM, DateFormat.SHORT);
@@ -32,7 +32,7 @@ public class GitHubTaskAttributeMapper extends TaskAttributeMapper {
 	/**
 	 * @param taskRepository
 	 */
-	public GitHubTaskAttributeMapper(TaskRepository taskRepository) {
+	public IssueAttributeMapper(TaskRepository taskRepository) {
 		super(taskRepository);
 	}
 
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
index 24f688b5..274c4bcc 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubRepositoryConnector.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
@@ -10,7 +10,7 @@
  *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
  *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core.issue;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -41,6 +41,9 @@ import org.eclipse.egit.github.core.util.LabelComparator;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
 import org.eclipse.mylyn.commons.net.Policy;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHubException;
+import org.eclipse.mylyn.internal.github.core.QueryUtils;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.ITask;
@@ -55,7 +58,7 @@ import org.eclipse.mylyn.tasks.core.sync.ISynchronizationSession;
 /**
  * GitHub connector.
  */
-public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
+public class IssueConnector extends AbstractRepositoryConnector {
 
 	/**
 	 * GitHub kind.
@@ -81,7 +84,7 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
 	/**
 	 * GitHub specific {@link AbstractTaskDataHandler}.
 	 */
-	private final GitHubTaskDataHandler taskDataHandler;
+	private final IssueTaskDataHandler taskDataHandler;
 
 	private final Map<TaskRepository, List<Label>> repositoryLabels = Collections
 			.synchronizedMap(new HashMap<TaskRepository, List<Label>>());
@@ -92,8 +95,8 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
 	/**
 	 * Create GitHub issue repository connector
 	 */
-	public GitHubRepositoryConnector() {
-		taskDataHandler = new GitHubTaskDataHandler(this);
+	public IssueConnector() {
+		taskDataHandler = new IssueTaskDataHandler(this);
 	}
 
 	/**
@@ -233,7 +236,7 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
 	 */
 	@Override
 	public String getLabel() {
-		return Messages.GitHubRepositoryConnector_LabelConnector;
+		return Messages.IssueConnector_LabelConnector;
 	}
 
 	/**
@@ -252,7 +255,7 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
 		List<String> statuses = QueryUtils.getAttributes(
 				IssueService.FILTER_STATE, query);
 
-		monitor.beginTask(Messages.GitHubRepositoryConnector_TaskQuerying,
+		monitor.beginTask(Messages.IssueConector_TaskQuerying,
 				statuses.size());
 		try {
 			Repository repo = GitHub.getRepository(repository
@@ -370,10 +373,10 @@ public class GitHubRepositoryConnector extends AbstractRepositoryConnector {
 			IProgressMonitor monitor) throws CoreException {
 		monitor = Policy.monitorFor(monitor);
 		monitor.beginTask("", 2); //$NON-NLS-1$
-		monitor.setTaskName(Messages.GitHubRepositoryConnector_TaskUpdatingLabels);
+		monitor.setTaskName(Messages.IssueConnector_TaskUpdatingLabels);
 		refreshLabels(taskRepository);
 		monitor.worked(1);
-		monitor.setTaskName(Messages.GitHubRepositoryConnector_TaskUpdatingMilestones);
+		monitor.setTaskName(Messages.IssueConnector_TaskUpdatingMilestones);
 		refreshMilestones(taskRepository);
 		monitor.done();
 	}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskOperation.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueOperation.java
index 58c5b6ea..d851919d 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskOperation.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueOperation.java
@@ -10,12 +10,12 @@
  *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
  *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core.issue;
 
 /**
  * Enumeration of task operations
  */
-public enum GitHubTaskOperation {
+public enum IssueOperation {
 
 	/**
 	 * LEAD
@@ -34,7 +34,7 @@ public enum GitHubTaskOperation {
 
 	private final String label;
 
-	private GitHubTaskOperation(String label) {
+	private IssueOperation(String label) {
 		this.label = label;
 	}
 
@@ -64,8 +64,8 @@ public enum GitHubTaskOperation {
 	 * @return the operation, or null if the id was null or did not match any
 	 *         operation
 	 */
-	public static GitHubTaskOperation fromId(String opId) {
-		for (GitHubTaskOperation op : values()) {
+	public static IssueOperation fromId(String opId) {
+		for (IssueOperation op : values()) {
 			if (op.getId().equals(opId)) {
 				return op;
 			}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java
index f65b9239..3cb43c81 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/github/internal/GitHubTaskDataHandler.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueTaskDataHandler.java
@@ -10,7 +10,7 @@
  *     Christian Trutz <christian.trutz@gmail.com> - initial contribution
  *     Chris Aniszczyk <caniszczyk@gmail.com> - initial contribution
  *******************************************************************************/
-package org.eclipse.mylyn.github.internal;
+package org.eclipse.mylyn.internal.github.core.issue;
 
 import java.io.IOException;
 import java.util.Date;
@@ -30,6 +30,8 @@ import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.client.RequestException;
 import org.eclipse.egit.github.core.service.IssueService;
 import org.eclipse.egit.github.core.service.LabelService;
+import org.eclipse.mylyn.internal.github.core.GitHub;
+import org.eclipse.mylyn.internal.github.core.GitHubException;
 import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
 import org.eclipse.mylyn.tasks.core.ITaskMapping;
 import org.eclipse.mylyn.tasks.core.RepositoryResponse;
@@ -46,26 +48,26 @@ import org.eclipse.mylyn.tasks.core.data.TaskOperation;
 /**
  * GitHub issue task data handler
  */
-public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
+public class IssueTaskDataHandler extends AbstractTaskDataHandler {
 
 	private static final String DATA_VERSION = "1"; //$NON-NLS-1$
 	private static final String MILESTONE_NONE_KEY = "0"; //$NON-NLS-1$
-	private GitHubTaskAttributeMapper taskAttributeMapper = null;
-	private final GitHubRepositoryConnector connector;
+	private IssueAttributeMapper taskAttributeMapper = null;
+	private final IssueConnector connector;
 
 	/**
 	 * Create GitHub issue task data handler for connector
 	 * 
 	 * @param connector
 	 */
-	public GitHubTaskDataHandler(GitHubRepositoryConnector connector) {
+	public IssueTaskDataHandler(IssueConnector connector) {
 		this.connector = connector;
 	}
 
 	@Override
 	public TaskAttributeMapper getAttributeMapper(TaskRepository taskRepository) {
 		if (this.taskAttributeMapper == null)
-			this.taskAttributeMapper = new GitHubTaskAttributeMapper(
+			this.taskAttributeMapper = new IssueAttributeMapper(
 					taskRepository);
 		return this.taskAttributeMapper;
 	}
@@ -75,40 +77,40 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 
 		String key = Integer.toString(issue.getNumber());
 		TaskData data = new TaskData(getAttributeMapper(repository),
-				GitHubRepositoryConnector.KIND, repository.getRepositoryUrl(),
+				IssueConnector.KIND, repository.getRepositoryUrl(),
 				key);
 		data.setVersion(DATA_VERSION);
 
 		createOperations(data, issue);
 
-		createAttribute(data, GitHubTaskAttributes.KEY, key);
-		createAttribute(data, GitHubTaskAttributes.TITLE, issue.getTitle());
-		createAttribute(data, GitHubTaskAttributes.BODY, issue.getBody());
-		createAttribute(data, GitHubTaskAttributes.STATUS, issue.getState());
-		createAttribute(data, GitHubTaskAttributes.CREATION_DATE,
+		createAttribute(data, IssueAttribute.KEY, key);
+		createAttribute(data, IssueAttribute.TITLE, issue.getTitle());
+		createAttribute(data, IssueAttribute.BODY, issue.getBody());
+		createAttribute(data, IssueAttribute.STATUS, issue.getState());
+		createAttribute(data, IssueAttribute.CREATION_DATE,
 				issue.getCreatedAt());
-		createAttribute(data, GitHubTaskAttributes.MODIFICATION_DATE,
+		createAttribute(data, IssueAttribute.MODIFICATION_DATE,
 				issue.getUpdatedAt());
-		createAttribute(data, GitHubTaskAttributes.CLOSED_DATE,
+		createAttribute(data, IssueAttribute.CLOSED_DATE,
 				issue.getClosedAt());
 
 		User reporter = issue.getUser();
-		createAttribute(data, GitHubTaskAttributes.REPORTER, reporter,
+		createAttribute(data, IssueAttribute.REPORTER, reporter,
 				repository);
 		String reporterGravatar = reporter != null ? reporter.getGravatarUrl()
 				: null;
-		createAttribute(data, GitHubTaskAttributes.REPORTER_GRAVATAR,
+		createAttribute(data, IssueAttribute.REPORTER_GRAVATAR,
 				reporterGravatar);
 
 		User assignee = issue.getAssignee();
-		createAttribute(data, GitHubTaskAttributes.ASSIGNEE, assignee,
+		createAttribute(data, IssueAttribute.ASSIGNEE, assignee,
 				repository);
 		String assigneeGravatar = assignee != null ? assignee.getGravatarUrl()
 				: null;
-		createAttribute(data, GitHubTaskAttributes.ASSIGNEE_GRAVATAR,
+		createAttribute(data, IssueAttribute.ASSIGNEE_GRAVATAR,
 				assigneeGravatar);
 
-		createAttribute(data, GitHubTaskAttributes.COMMENT_NEW);
+		createAttribute(data, IssueAttribute.COMMENT_NEW);
 
 		createLabels(repository, data, issue);
 
@@ -123,7 +125,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		String number = current != null ? Integer.toString(current.getNumber())
 				: MILESTONE_NONE_KEY;
 		TaskAttribute milestoneAttribute = createAttribute(data,
-				GitHubTaskAttributes.MILESTONE, number);
+				IssueAttribute.MILESTONE, number);
 
 		if (!this.connector.hasCachedMilestones(repository))
 			try {
@@ -135,7 +137,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		List<Milestone> cachedMilestones = this.connector
 				.getMilestones(repository);
 		milestoneAttribute.putOption(MILESTONE_NONE_KEY,
-				Messages.GitHubTaskDataHandler_MilestoneNone);
+				Messages.IssueAttribute_MilestoneNone);
 		for (Milestone milestone : cachedMilestones)
 			milestoneAttribute.putOption(
 					Integer.toString(milestone.getNumber()),
@@ -145,7 +147,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 	private void createLabels(TaskRepository repository, TaskData data,
 			Issue issue) {
 		TaskAttribute labels = createAttribute(data,
-				GitHubTaskAttributes.LABELS, issue.getLabels());
+				IssueAttribute.LABELS, issue.getLabels());
 
 		if (!this.connector.hasCachedLabels(repository))
 			try {
@@ -167,17 +169,17 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		if (!data.isNew()) {
 			String state = issue.getState();
 			if (state != null) {
-				addOperation(data, issue, GitHubTaskOperation.LEAVE, true);
+				addOperation(data, issue, IssueOperation.LEAVE, true);
 				if (state.equals(IssueService.STATE_OPEN))
-					addOperation(data, issue, GitHubTaskOperation.CLOSE, false);
+					addOperation(data, issue, IssueOperation.CLOSE, false);
 				else if (state.equals(IssueService.STATE_CLOSED))
-					addOperation(data, issue, GitHubTaskOperation.REOPEN, false);
+					addOperation(data, issue, IssueOperation.REOPEN, false);
 			}
 		}
 	}
 
 	private void addOperation(TaskData data, Issue issue,
-			GitHubTaskOperation operation, boolean asDefault) {
+			IssueOperation operation, boolean asDefault) {
 		TaskAttribute attribute = data.getRoot().createAttribute(
 				TaskAttribute.PREFIX_OPERATION + operation.getId());
 		String label = createOperationLabel(issue, operation);
@@ -191,8 +193,8 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 	}
 
 	private String createOperationLabel(Issue issue,
-			GitHubTaskOperation operation) {
-		return operation == GitHubTaskOperation.LEAVE ? operation.getLabel()
+			IssueOperation operation) {
+		return operation == IssueOperation.LEAVE ? operation.getLabel()
 				+ issue.getState() : operation.getLabel();
 	}
 
@@ -233,11 +235,11 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		if (!taskData.isNew()) {
 			issue.setNumber(Integer.parseInt(taskData.getTaskId()));
 		}
-		issue.setBody(getAttributeValue(taskData, GitHubTaskAttributes.BODY));
-		issue.setTitle(getAttributeValue(taskData, GitHubTaskAttributes.TITLE));
+		issue.setBody(getAttributeValue(taskData, IssueAttribute.BODY));
+		issue.setTitle(getAttributeValue(taskData, IssueAttribute.TITLE));
 
 		String assigneeValue = getAttributeValue(taskData,
-				GitHubTaskAttributes.ASSIGNEE);
+				IssueAttribute.ASSIGNEE);
 		if (assigneeValue != null) {
 			if (assigneeValue.trim().length() == 0)
 				assigneeValue = null;
@@ -246,7 +248,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		}
 
 		String milestoneValue = getAttributeValue(taskData,
-				GitHubTaskAttributes.MILESTONE);
+				IssueAttribute.MILESTONE);
 		if (milestoneValue != null) {
 			Milestone milestone = new Milestone();
 			if (milestoneValue.length() > 0)
@@ -257,13 +259,13 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 	}
 
 	private String getAttributeValue(TaskData taskData,
-			GitHubTaskAttributes attr) {
+			IssueAttribute attr) {
 		TaskAttribute attribute = taskData.getRoot().getAttribute(attr.getId());
 		return attribute == null ? null : attribute.getValue();
 	}
 
 	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute) {
+			IssueAttribute attribute) {
 		TaskAttribute attr = data.getRoot().createAttribute(attribute.getId());
 		TaskAttributeMetaData metaData = attr.getMetaData();
 		metaData.defaults().setType(attribute.getType())
@@ -273,7 +275,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 	}
 
 	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute, String value) {
+			IssueAttribute attribute, String value) {
 		TaskAttribute attr = createAttribute(data, attribute);
 		if (value != null) {
 			data.getAttributeMapper().setValue(attr, value);
@@ -282,7 +284,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 	}
 
 	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute, Date value) {
+			IssueAttribute attribute, Date value) {
 		TaskAttribute attr = createAttribute(data, attribute);
 		if (value != null) {
 			data.getAttributeMapper().setDateValue(attr, value);
@@ -290,7 +292,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		return attr;
 	}
 
-	private void createAttribute(TaskData data, GitHubTaskAttributes attribute,
+	private void createAttribute(TaskData data, IssueAttribute attribute,
 			User value, TaskRepository repository) {
 		TaskAttribute attr = createAttribute(data, attribute);
 		if (value != null) {
@@ -302,7 +304,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 	}
 
 	private TaskAttribute createAttribute(TaskData data,
-			GitHubTaskAttributes attribute, List<Label> values) {
+			IssueAttribute attribute, List<Label> values) {
 		TaskAttribute attr = createAttribute(data, attribute);
 		if (values != null) {
 			List<String> labels = new LinkedList<String>();
@@ -321,7 +323,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 
 		data.setVersion(DATA_VERSION);
 
-		for (GitHubTaskAttributes attr : GitHubTaskAttributes.values()) {
+		for (IssueAttribute attr : IssueAttribute.values()) {
 			if (attr.isInitTask()) {
 				createAttribute(data, attr, (String) null);
 			}
@@ -346,7 +348,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 			Set<TaskAttribute> oldAttributes) throws IOException {
 		// Update labels if changed
 		TaskAttribute labelsAttribute = data.getRoot().getAttribute(
-				GitHubTaskAttributes.LABELS.getId());
+				IssueAttribute.LABELS.getId());
 		if (oldAttributes.contains(labelsAttribute)) {
 			LabelService labelService = new LabelService(client);
 
@@ -392,7 +394,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 		Issue issue = createIssue(taskData);
 		Repository repo = GitHub.getRepository(repository.getRepositoryUrl());
 		try {
-			GitHubClient client = GitHubRepositoryConnector
+			GitHubClient client = IssueConnector
 					.createClient(repository);
 			IssueService service = new IssueService(client);
 			if (taskData.isNew()) {
@@ -404,7 +406,7 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 
 				// Handle new comment
 				String comment = getAttributeValue(taskData,
-						GitHubTaskAttributes.COMMENT_NEW);
+						IssueAttribute.COMMENT_NEW);
 				if (comment != null && comment.length() > 0)
 					service.createComment(repo.getOwner(), repo.getName(),
 							taskId, comment);
@@ -416,9 +418,9 @@ public class GitHubTaskDataHandler extends AbstractTaskDataHandler {
 				TaskAttribute operationAttribute = taskData.getRoot()
 						.getAttribute(TaskAttribute.OPERATION);
 				if (operationAttribute != null) {
-					GitHubTaskOperation operation = GitHubTaskOperation
+					IssueOperation operation = IssueOperation
 							.fromId(operationAttribute.getValue());
-					if (operation != GitHubTaskOperation.LEAVE)
+					if (operation != IssueOperation.LEAVE)
 						switch (operation) {
 						case REOPEN:
 							issue.setState(IssueService.STATE_OPEN);
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java
new file mode 100644
index 00000000..6b97a831
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/Messages.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ *  Copyright (c) 2011 GitHub Inc.
+ *  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:
+ *    Kevin Sawicki (GitHub Inc.) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.github.core.issue;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * NLS for Mylyn GitHub Core
+ */
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.github.core.issue.messages"; //$NON-NLS-1$
+
+	/** */
+	public static String IssueConnector_LabelConnector;
+
+	/** */
+	public static String IssueConector_TaskQuerying;
+
+	/** */
+	public static String IssueConnector_TaskUpdatingLabels;
+
+	/** */
+	public static String IssueConnector_TaskUpdatingMilestones;
+
+	/** */
+	public static String IssueAttribute_LabekSummary;
+
+	/** */
+	public static String IssueAttribute_LabelAssignee;
+
+	/** */
+	public static String IssueAttribute_LabelAssigneeGravatar;
+
+	/** */
+	public static String IssueAttribute_LabelClosed;
+
+	/** */
+	public static String IssueAttribute_LabelComment;
+
+	/** */
+	public static String IssueAttribute_LabelCreated;
+
+	/** */
+	public static String IssueAttribute_LabelDescription;
+
+	/** */
+	public static String IssueAttribute_LabelKey;
+
+	/** */
+	public static String IssueAttribute_LabelLabels;
+
+	/** */
+	public static String IssueAttribute_LabelMilestone;
+
+	/** */
+	public static String IssueAttribute_LabelModified;
+
+	/** */
+	public static String IssueAttribute_LabelReporter;
+
+	/** */
+	public static String IssueAttribute_LabelReporterGravatar;
+
+	/** */
+	public static String IssueAttribute_LabelStatus;
+
+	/** */
+	public static String IssueAttribute_MilestoneNone;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties
new file mode 100644
index 00000000..b64e1b8a
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/messages.properties
@@ -0,0 +1,19 @@
+IssueConnector_LabelConnector=GitHub Issues
+IssueConector_TaskQuerying=Querying repository...
+IssueConnector_TaskUpdatingLabels=Updating labels
+IssueConnector_TaskUpdatingMilestones=Updating milestones
+IssueAttribute_LabekSummary=Summary
+IssueAttribute_LabelAssignee=Assignee:
+IssueAttribute_LabelAssigneeGravatar=Assignee
+IssueAttribute_LabelClosed=Closed:
+IssueAttribute_LabelComment=Comment:
+IssueAttribute_LabelCreated=Created:
+IssueAttribute_LabelDescription=Description
+IssueAttribute_LabelKey=Key
+IssueAttribute_LabelLabels=Labels:
+IssueAttribute_LabelMilestone=Milestone:
+IssueAttribute_LabelModified=Modified:
+IssueAttribute_LabelReporter=Reporter:
+IssueAttribute_LabelReporterGravatar=Reporter
+IssueAttribute_LabelStatus=Status:
+IssueAttribute_MilestoneNone=None
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties
new file mode 100644
index 00000000..52d8a86a
--- /dev/null
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/messages.properties
@@ -0,0 +1,4 @@
+FieldError_InvalidField=Invalid value for field {1}
+FieldError_InvalidFieldWithValue=Invalid value of {0} for field {1}
+FieldError_MissingField=Missing required field {0}
+FieldError_ResourceError=Error with field {0} in {1} resource