diff options
29 files changed, 88 insertions, 0 deletions
diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java index e8569b6d..0e998ef9 100644 --- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java +++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestServiceTest.java @@ -123,6 +123,7 @@ public class PullRequestServiceTest { public void getPullRequestsNullRepositoryId() throws IOException { pullRequestService.getPullRequests(new IRepositoryIdProvider() { + @Override public String generateId() { return null; } diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Label.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Label.java index fff30ba6..1a67dbd1 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Label.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Label.java @@ -31,6 +31,7 @@ public class Label implements Serializable { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -44,6 +45,7 @@ public class Label implements Serializable { /** * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { final String name = this.name; return name != null ? name.hashCode() : super.hashCode(); @@ -52,6 +54,7 @@ public class Label implements Serializable { /** * @see java.lang.Object#toString() */ + @Override public String toString() { final String name = this.name; return name != null ? name : super.toString(); diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/RepositoryId.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/RepositoryId.java index b28df57b..7205c3f6 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/RepositoryId.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/RepositoryId.java @@ -131,6 +131,7 @@ public class RepositoryId implements IRepositoryIdProvider, Serializable { return name; } + @Override public String generateId() { return owner + "/" + name; //$NON-NLS-1$ } diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/SearchRepository.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/SearchRepository.java index efa2e032..41d142bb 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/SearchRepository.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/SearchRepository.java @@ -79,6 +79,7 @@ public class SearchRepository implements IRepositoryIdProvider, Serializable { /** * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return getId().hashCode(); } @@ -86,6 +87,7 @@ public class SearchRepository implements IRepositoryIdProvider, Serializable { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -98,6 +100,7 @@ public class SearchRepository implements IRepositoryIdProvider, Serializable { /** * @see java.lang.Object#toString() */ + @Override public String toString() { return getId(); } @@ -230,6 +233,7 @@ public class SearchRepository implements IRepositoryIdProvider, Serializable { return watchers; } + @Override public String generateId() { final String owner = this.owner; if (owner == null || owner.length() == 0) diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubRequest.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubRequest.java index bbe4fb57..c29b3b90 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubRequest.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/GitHubRequest.java @@ -163,11 +163,13 @@ public class GitHubRequest { return this; } + @Override public int hashCode() { final String fullUri = generateUri(); return fullUri != null ? fullUri.hashCode() : super.hashCode(); } + @Override public boolean equals(final Object obj) { if (obj == this) return true; @@ -178,6 +180,7 @@ public class GitHubRequest { return fullUri != null && objUri != null && fullUri.equals(objUri); } + @Override public String toString() { final String fullUri = generateUri(); return fullUri != null ? fullUri : super.toString(); diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/PageIterator.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/PageIterator.java index 651b545e..a9f81a6c 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/PageIterator.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/PageIterator.java @@ -148,14 +148,17 @@ public class PageIterator<V> implements Iterator<Collection<V>>, return last; } + @Override public boolean hasNext() { return nextPage == 0 || next != null; } + @Override public void remove() { throw new UnsupportedOperationException("Remove not supported"); //$NON-NLS-1$ } + @Override @SuppressWarnings("unchecked") public Collection<V> next() { if (!hasNext()) @@ -207,6 +210,7 @@ public class PageIterator<V> implements Iterator<Collection<V>>, /** * @return this page iterator */ + @Override public Iterator<Collection<V>> iterator() { return this; } diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/RequestException.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/RequestException.java index 9131d388..7636eabf 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/RequestException.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/client/RequestException.java @@ -58,6 +58,7 @@ public class RequestException extends IOException { this.status = status; } + @Override public String getMessage() { return error != null ? formatErrors() : super.getMessage(); } diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/LabelComparator.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/LabelComparator.java index ffc72f8b..54c473de 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/LabelComparator.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/LabelComparator.java @@ -30,6 +30,7 @@ public class LabelComparator implements Comparator<Label>, Serializable { /** * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(Label label1, Label label2) { return label1.getName().compareToIgnoreCase(label2.getName()); } diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/MilestoneComparator.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/MilestoneComparator.java index 5a19f12f..dea7256c 100644 --- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/MilestoneComparator.java +++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/util/MilestoneComparator.java @@ -27,6 +27,7 @@ public class MilestoneComparator implements Comparator<Milestone>, Serializable */ private static final long serialVersionUID = 7166479273639101758L; + @Override public int compare(Milestone m1, Milestone m2) { return m1.getTitle().compareToIgnoreCase(m2.getTitle()); } diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java index 52ad3f79..f075d537 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubException.java @@ -50,6 +50,7 @@ public class GitHubException extends IOException { initCause(cause); } + @Override public String getMessage() { RequestError error = ((RequestException) getCause()).getError(); String errorMessage = error.getMessage(); diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubTaskAttributeMapper.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubTaskAttributeMapper.java index 21deb6c7..43439afb 100644 --- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubTaskAttributeMapper.java +++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/GitHubTaskAttributeMapper.java @@ -39,6 +39,7 @@ public class GitHubTaskAttributeMapper extends TaskAttributeMapper { /** * @see org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper#getValueLabels(org.eclipse.mylyn.tasks.core.data.TaskAttribute) */ + @Override public List<String> getValueLabels(final TaskAttribute taskAttribute) { final String type = taskAttribute.getMetaData().getType(); if (TaskAttribute.TYPE_DATE.equals(type) 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 22d79862..4de526fc 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 @@ -42,6 +42,7 @@ public class GistAttachmentHandler extends AbstractTaskAttachmentHandler { * @see org.eclipse.mylyn.tasks.core.data.AbstractTaskAttachmentHandler#canGetContent(org.eclipse.mylyn.tasks.core.TaskRepository, * org.eclipse.mylyn.tasks.core.ITask) */ + @Override public boolean canGetContent(TaskRepository repository, ITask task) { return true; } @@ -50,6 +51,7 @@ public class GistAttachmentHandler extends AbstractTaskAttachmentHandler { * @see org.eclipse.mylyn.tasks.core.data.AbstractTaskAttachmentHandler#canPostContent(org.eclipse.mylyn.tasks.core.TaskRepository, * org.eclipse.mylyn.tasks.core.ITask) */ + @Override public boolean canPostContent(TaskRepository repository, ITask task) { return true; } @@ -60,6 +62,7 @@ public class GistAttachmentHandler extends AbstractTaskAttachmentHandler { * org.eclipse.mylyn.tasks.core.data.TaskAttribute, * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public InputStream getContent(TaskRepository repository, ITask task, TaskAttribute attachmentAttribute, IProgressMonitor monitor) throws CoreException { @@ -71,6 +74,7 @@ public class GistAttachmentHandler extends AbstractTaskAttachmentHandler { URL url = new URL(urlAttribute.getValue()); GitHubClient client = new GitHubClient(url.getHost()) { + @Override protected String configureUri(String uri) { // No prefix needed since URI is not an actual API URI return uri; @@ -90,6 +94,7 @@ public class GistAttachmentHandler extends AbstractTaskAttachmentHandler { * java.lang.String, org.eclipse.mylyn.tasks.core.data.TaskAttribute, * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void postContent(TaskRepository repository, ITask task, AbstractTaskAttachmentSource source, String comment, TaskAttribute attachmentAttribute, IProgressMonitor monitor) 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 b3e12ace..1fe3c095 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 @@ -74,6 +74,7 @@ public class GistConnector extends RepositoryConnector { /** * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#getTaskDataHandler() */ + @Override public AbstractTaskDataHandler getTaskDataHandler() { return dataHandler; } @@ -81,6 +82,7 @@ public class GistConnector extends RepositoryConnector { /** * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#getTaskAttachmentHandler() */ + @Override public AbstractTaskAttachmentHandler getTaskAttachmentHandler() { return attachmentHandler; } @@ -88,6 +90,7 @@ public class GistConnector extends RepositoryConnector { /** * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#canCreateNewTask(org.eclipse.mylyn.tasks.core.TaskRepository) */ + @Override public boolean canCreateNewTask(TaskRepository repository) { // Gists are created from menu actions on files and text selections return false; @@ -96,6 +99,7 @@ public class GistConnector extends RepositoryConnector { /** * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#getConnectorKind() */ + @Override public String getConnectorKind() { return KIND; } @@ -103,6 +107,7 @@ public class GistConnector extends RepositoryConnector { /** * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#getLabel() */ + @Override public String getLabel() { return Messages.GistConnector_LabelConnector; } @@ -110,6 +115,7 @@ public class GistConnector extends RepositoryConnector { /** * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#getRepositoryUrlFromTaskUrl(java.lang.String) */ + @Override public String getRepositoryUrlFromTaskUrl(String taskFullUrl) { int lastSlash = taskFullUrl.lastIndexOf('/'); return lastSlash >= 0 ? taskFullUrl.substring(0, lastSlash) : null; @@ -119,6 +125,7 @@ public class GistConnector extends RepositoryConnector { * @see org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector#getTaskData(org.eclipse.mylyn.tasks.core.TaskRepository, * java.lang.String, org.eclipse.core.runtime.IProgressMonitor) */ + @Override public TaskData getTaskData(TaskRepository repository, String taskId, IProgressMonitor monitor) throws CoreException { GistService service = new GistService(createClient(repository)); @@ -146,6 +153,7 @@ public class GistConnector extends RepositoryConnector { * org.eclipse.mylyn.tasks.core.sync.ISynchronizationSession, * org.eclipse.core.runtime.IProgressMonitor) */ + @Override public IStatus performQuery(TaskRepository repository, IRepositoryQuery query, TaskDataCollector collector, ISynchronizationSession session, IProgressMonitor monitor) { diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/AvatarLabel.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/AvatarLabel.java index a7c645e8..1a702b5f 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/AvatarLabel.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/AvatarLabel.java @@ -134,6 +134,7 @@ public class AvatarLabel implements IAvatarCallback { avatarImage.setBackgroundImage(image); avatarImage.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { image.dispose(); } @@ -146,9 +147,11 @@ public class AvatarLabel implements IAvatarCallback { * @see org.eclipse.mylyn.internal.github.ui.AvatarStore.IAvatarCallback#loaded(org.eclipse.swt.graphics.ImageData, * org.eclipse.mylyn.internal.github.ui.AvatarStore) */ + @Override public void loaded(final ImageData data, final AvatarStore store) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { Image image = store.getScaledImage(AVATAR_SIZE, data); setImage(image).setVisible(true).layout(); diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubRepositoryQueryPage.java index 9b0a0a80..0b2ea780 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubRepositoryQueryPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubRepositoryQueryPage.java @@ -41,6 +41,7 @@ public abstract class GitHubRepositoryQueryPage extends super(pageName, taskRepository, query); } + @Override public void setPageComplete(boolean complete) { super.setPageComplete(complete); // Forward completeness to search container if applicable diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java index 317835fd..76931d5a 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java @@ -144,6 +144,7 @@ public class CloneGistHandler extends TaskDataHandler { private Job createCloneJob(final ExecutionEvent event, final TaskData data) { Job job = new Job(Messages.CloneGistHandler_TaskCloning) { + @Override protected IStatus run(IProgressMonitor monitor) { try { final String name = getGistName(data); @@ -152,6 +153,7 @@ public class CloneGistHandler extends TaskDataHandler { operation.addPostCloneTask(new PostCloneTask() { + @Override public void execute(Repository repository, IProgressMonitor monitor) throws CoreException { if (monitor.isCanceled()) @@ -164,10 +166,12 @@ public class CloneGistHandler extends TaskDataHandler { operation.addPostCloneTask(new PostCloneTask() { + @Override public void execute(final Repository repository, IProgressMonitor monitor) throws CoreException { IWorkspaceRunnable runnable = new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { if (monitor.isCanceled()) @@ -201,6 +205,7 @@ public class CloneGistHandler extends TaskDataHandler { .getCause() : exception; PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { ErrorDialog.openError(HandlerUtil.getActiveShell(event), Messages.CloneGistHandler_ErrorTitle, @@ -214,6 +219,7 @@ public class CloneGistHandler extends TaskDataHandler { /** * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { TaskData data = getTaskData(event); if (data != null) diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPage.java index b40bf14e..7cd75a5c 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPage.java @@ -54,6 +54,7 @@ public class GistAttachmentPage extends WizardPage { /** * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite displayArea = new Composite(parent, SWT.NONE); GridLayoutFactory.swtDefaults().numColumns(2).applyTo(displayArea); @@ -65,6 +66,7 @@ public class GistAttachmentPage extends WizardPage { GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText); nameText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { updateFilename(); } @@ -88,6 +90,7 @@ public class GistAttachmentPage extends WizardPage { /** * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean) */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorUi.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorUi.java index fc6d38b2..a121cd83 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorUi.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorUi.java @@ -58,6 +58,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { /** * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getTaskKindLabel(org.eclipse.mylyn.tasks.core.ITask) */ + @Override public String getTaskKindLabel(ITask task) { return Messages.GistConnectorUi_LabelTaskKind; } @@ -65,6 +66,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { /** * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getConnectorKind() */ + @Override public String getConnectorKind() { return GistConnector.KIND; } @@ -72,6 +74,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { /** * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getSettingsPage(org.eclipse.mylyn.tasks.core.TaskRepository) */ + @Override public ITaskRepositoryPage getSettingsPage(TaskRepository taskRepository) { return new GistRepositorySettingsPage(taskRepository); } @@ -80,6 +83,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getQueryWizard(org.eclipse.mylyn.tasks.core.TaskRepository, * org.eclipse.mylyn.tasks.core.IRepositoryQuery) */ + @Override public IWizard getQueryWizard(TaskRepository taskRepository, IRepositoryQuery queryToEdit) { RepositoryQueryWizard wizard = new RepositoryQueryWizard(taskRepository); @@ -91,6 +95,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getNewTaskWizard(org.eclipse.mylyn.tasks.core.TaskRepository, * org.eclipse.mylyn.tasks.core.ITaskMapping) */ + @Override public IWizard getNewTaskWizard(TaskRepository taskRepository, ITaskMapping selection) { return new NewTaskWizard(taskRepository, selection); @@ -99,6 +104,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { /** * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#hasSearchPage() */ + @Override public boolean hasSearchPage() { return true; } @@ -107,6 +113,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getSearchPage(org.eclipse.mylyn.tasks.core.TaskRepository, * org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public ITaskSearchPage getSearchPage(TaskRepository repository, IStructuredSelection selection) { return new GistRepositoryQueryPage(repository, null); @@ -115,6 +122,7 @@ public class GistConnectorUi extends AbstractRepositoryConnectorUi { /** * @see org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi#getTaskAttachmentPage(org.eclipse.mylyn.tasks.core.data.TaskAttachmentModel) */ + @Override public IWizardPage getTaskAttachmentPage(TaskAttachmentModel model) { return new GistAttachmentPage(model); } diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPageFactory.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPageFactory.java index 4b81cb27..5ca6ee20 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPageFactory.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPageFactory.java @@ -31,6 +31,7 @@ public class GistTaskEditorPageFactory extends AbstractTaskEditorPageFactory { /** * @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory#canCreatePageFor(org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput) */ + @Override public boolean canCreatePageFor(TaskEditorInput input) { ITask task = input.getTask(); return GistConnector.KIND.equals(task.getConnectorKind()) @@ -40,6 +41,7 @@ public class GistTaskEditorPageFactory extends AbstractTaskEditorPageFactory { /** * @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory#createPage(org.eclipse.mylyn.tasks.ui.editors.TaskEditor) */ + @Override public IFormPage createPage(TaskEditor parentEditor) { return new GistTaskEditorPage(parentEditor, GistConnector.KIND); } @@ -47,6 +49,7 @@ public class GistTaskEditorPageFactory extends AbstractTaskEditorPageFactory { /** * @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory#getPageImage() */ + @Override public Image getPageImage() { return GitHubImages.get(GitHubImages.GITHUB_LOGO_OBJ); } @@ -54,6 +57,7 @@ public class GistTaskEditorPageFactory extends AbstractTaskEditorPageFactory { /** * @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory#getPageText() */ + @Override public String getPageText() { return Messages.GistTaskEditorPageFactory_PageText; } @@ -61,6 +65,7 @@ public class GistTaskEditorPageFactory extends AbstractTaskEditorPageFactory { /** * @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory#getPriority() */ + @Override public int getPriority() { return PRIORITY_TASK; } @@ -68,6 +73,7 @@ public class GistTaskEditorPageFactory extends AbstractTaskEditorPageFactory { /** * @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory#getConflictingIds(org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput) */ + @Override public String[] getConflictingIds(TaskEditorInput input) { return new String[] { ITasksUiConstants.ID_PAGE_PLANNING }; } diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java index 74596dee..d4833f3d 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueTaskEditorPage.java @@ -64,6 +64,7 @@ public class IssueTaskEditorPage extends AbstractTaskEditorPage { } partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_SUMMARY) { + @Override public AbstractTaskEditorPart createPart() { return new IssueSummaryPart(IssueAttribute.REPORTER_GRAVATAR .getMetadata().getId(), @@ -72,6 +73,7 @@ public class IssueTaskEditorPage extends AbstractTaskEditorPage { }.setPath(PATH_HEADER)); partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_ATTRIBUTES) { + @Override public AbstractTaskEditorPart createPart() { return new IssueAttributePart(); } @@ -103,6 +105,7 @@ public class IssueTaskEditorPage extends AbstractTaskEditorPage { AuthenticationCredentials cred = taskRepository.getCredentials(AuthenticationType.REPOSITORY); if (cred == null || cred.getUserName() == null || cred.getUserName().equals("")) { //$NON-NLS-1$ PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { + @Override public void run() { getTaskEditor().setMessage(Messages.IssueTaskEditorPage_MessageAnonymousCannotSubmit, type, new HyperlinkAdapter() { diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CheckoutPullRequestHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CheckoutPullRequestHandler.java index bcd69c9d..51087c66 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CheckoutPullRequestHandler.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CheckoutPullRequestHandler.java @@ -68,6 +68,7 @@ public class CheckoutPullRequestHandler extends TaskDataHandler { } } + @Override public Object execute(final ExecutionEvent event) throws ExecutionException { final TaskData data = getTaskData(event); if (data == null) @@ -76,6 +77,7 @@ public class CheckoutPullRequestHandler extends TaskDataHandler { Job job = new Job(MessageFormat.format( Messages.CheckoutPullRequestHandler_JobName, data.getTaskId())) { + @Override protected IStatus run(IProgressMonitor monitor) { SubProgressMonitor sub; try { diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/FetchPullRequestHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/FetchPullRequestHandler.java index b10c637b..40adf5cc 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/FetchPullRequestHandler.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/FetchPullRequestHandler.java @@ -53,6 +53,7 @@ public class FetchPullRequestHandler extends TaskDataHandler { } + @Override public Object execute(final ExecutionEvent event) throws ExecutionException { final TaskData data = getTaskData(event); if (data == null) @@ -61,6 +62,7 @@ public class FetchPullRequestHandler extends TaskDataHandler { Job job = new Job(MessageFormat.format( Messages.FetchPullRequestHandler_JobName, data.getTaskId())) { + @Override protected IStatus run(IProgressMonitor monitor) { try { PullRequestComposite prComp = PullRequestConnector diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/MergePullRequestHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/MergePullRequestHandler.java index 62ebd7b0..74239294 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/MergePullRequestHandler.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/MergePullRequestHandler.java @@ -45,6 +45,7 @@ public class MergePullRequestHandler extends TaskDataHandler { */ public static final String ID = "org.eclipse.mylyn.github.ui.command.mergePullRequest"; //$NON-NLS-1$ + @Override public Object execute(final ExecutionEvent event) throws ExecutionException { final TaskData data = getTaskData(event); if (data == null) @@ -52,6 +53,7 @@ public class MergePullRequestHandler extends TaskDataHandler { Job job = new Job(MessageFormat.format( Messages.MergePullRequestHandler_MergeJob, data.getTaskId())) { + @Override protected IStatus run(IProgressMonitor monitor) { PullRequestComposite prComp = PullRequestConnector .getPullRequest(data); diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java index c215fb10..7f47eeb1 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestCommitAdapter.java @@ -57,6 +57,7 @@ public class PullRequestCommitAdapter extends WorkbenchAdapter { return commit.getSha().substring(0, 8); } + @Override public StyledString getStyledText(Object object) { StyledString styled = new StyledString(getLabel(object)); String desc = commit.getCommit().getMessage(); diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestConnectorUi.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestConnectorUi.java index bc096fd3..e3c86b76 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestConnectorUi.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestConnectorUi.java @@ -49,6 +49,7 @@ public class PullRequestConnectorUi extends AbstractRepositoryConnectorUi { Messages.PullRequestConnectorUi_MessageRepositoryNotFound, id); PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + @Override public void run() { MessageDialog .openInformation( @@ -60,14 +61,17 @@ public class PullRequestConnectorUi extends AbstractRepositoryConnectorUi { }); } + @Override public String getConnectorKind() { return PullRequestConnector.KIND; } + @Override public ITaskRepositoryPage getSettingsPage(TaskRepository taskRepository) { return new PullRequestRepositorySettingsPage(taskRepository); } + @Override public IWizard getQueryWizard(TaskRepository taskRepository, IRepositoryQuery queryToEdit) { RepositoryQueryWizard wizard = new RepositoryQueryWizard(taskRepository); @@ -77,11 +81,13 @@ public class PullRequestConnectorUi extends AbstractRepositoryConnectorUi { return wizard; } + @Override public IWizard getNewTaskWizard(TaskRepository taskRepository, ITaskMapping selection) { return new NewTaskWizard(taskRepository, selection); } + @Override public boolean hasSearchPage() { return true; } diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestContextSynchronizer.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestContextSynchronizer.java index 8a9f8ddd..4729d617 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestContextSynchronizer.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestContextSynchronizer.java @@ -48,6 +48,7 @@ import org.eclipse.mylyn.tasks.ui.TasksUi; */ public class PullRequestContextSynchronizer extends TaskActivationAdapter { + @Override public void taskActivated(ITask task) { if (task == null) return; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositoryQueryPage.java index 44cf33c7..75e92ca9 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositoryQueryPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositoryQueryPage.java @@ -44,6 +44,7 @@ public class PullRequestRepositoryQueryPage extends GitHubRepositoryQueryPage { private SelectionListener completeListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setPageComplete(isPageComplete()); } @@ -100,6 +101,7 @@ public class PullRequestRepositoryQueryPage extends GitHubRepositoryQueryPage { /** * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite displayArea = new Composite(parent, SWT.NONE); GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(true) @@ -118,6 +120,7 @@ public class PullRequestRepositoryQueryPage extends GitHubRepositoryQueryPage { GridDataFactory.fillDefaults().grab(true, false).applyTo(titleText); titleText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { setPageComplete(isPageComplete()); } @@ -145,6 +148,7 @@ public class PullRequestRepositoryQueryPage extends GitHubRepositoryQueryPage { /** * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#isPageComplete() */ + @Override public boolean isPageComplete() { boolean complete = super.isPageComplete(); if (complete) { @@ -161,6 +165,7 @@ public class PullRequestRepositoryQueryPage extends GitHubRepositoryQueryPage { /** * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#getQueryTitle() */ + @Override public String getQueryTitle() { return this.titleText != null ? this.titleText.getText() : null; } @@ -168,6 +173,7 @@ public class PullRequestRepositoryQueryPage extends GitHubRepositoryQueryPage { /** * @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#applyTo(org.eclipse.mylyn.tasks.core.IRepositoryQuery) */ + @Override public void applyTo(IRepositoryQuery query) { query.setSummary(getQueryTitle()); diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestTaskEditorPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestTaskEditorPage.java index 175d94ad..f04e7f0e 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestTaskEditorPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestTaskEditorPage.java @@ -58,6 +58,7 @@ public class PullRequestTaskEditorPage extends AbstractTaskEditorPage { } partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_SUMMARY) { + @Override public AbstractTaskEditorPart createPart() { return new IssueSummaryPart( PullRequestAttribute.REPORTER_GRAVATAR.getMetadata() @@ -66,6 +67,7 @@ public class PullRequestTaskEditorPage extends AbstractTaskEditorPage { }.setPath(PATH_HEADER)); partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_ATTRIBUTES) { + @Override public AbstractTaskEditorPart createPart() { return new CommitAttributePart(prComp); } diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/RebasePullRequestHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/RebasePullRequestHandler.java index 683c7bdb..79a3071a 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/RebasePullRequestHandler.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/RebasePullRequestHandler.java @@ -45,6 +45,7 @@ public class RebasePullRequestHandler extends TaskDataHandler { */ public static final String ID = "org.eclipse.mylyn.github.ui.command.rebasePullRequest"; //$NON-NLS-1$ + @Override public Object execute(final ExecutionEvent event) throws ExecutionException { final TaskData data = getTaskData(event); if (data == null) @@ -52,6 +53,7 @@ public class RebasePullRequestHandler extends TaskDataHandler { Job job = new Job(MessageFormat.format( Messages.RebasePullRequestHandler_RebaseJob, data.getTaskId())) { + @Override protected IStatus run(IProgressMonitor monitor) { PullRequestComposite prComp = PullRequestConnector .getPullRequest(data); |