diff options
| author | Matthias Sohn | 2013-05-08 09:37:55 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2013-05-08 12:49:48 +0000 |
| commit | 4c18cb9905dc43d70cf6f0e5e072c765bca51542 (patch) | |
| tree | 8d67141c3aec857cd544d11f0a447e9e592e6c58 /org.eclipse.mylyn.github.ui/src/org | |
| parent | 898395f524f813e2cfd8eecabfac4ba9366ed889 (diff) | |
| download | egit-github-4c18cb9905dc43d70cf6f0e5e072c765bca51542.tar.gz egit-github-4c18cb9905dc43d70cf6f0e5e072c765bca51542.tar.xz egit-github-4c18cb9905dc43d70cf6f0e5e072c765bca51542.zip | |
Adapt github connector to compile against jgit/egit 3.0
Also flip github connectors own version to 3.0 since our simple release
process isn't able to cope with different versions for jgit/egit and
egit-github.
Change-Id: If099a7a0f8176d6a3e2c09a5709d906dad8f2620
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.mylyn.github.ui/src/org')
3 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java index 8cf00ca6..3c71b7ad 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositorySearchWizardPage.java @@ -22,7 +22,7 @@ import org.eclipse.egit.github.core.Repository; import org.eclipse.egit.github.core.SearchRepository; import org.eclipse.egit.github.core.service.RepositoryService; import org.eclipse.egit.github.core.util.UrlUtils; -import org.eclipse.egit.ui.UIIcons; +import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.provisional.wizards.GitRepositoryInfo; import org.eclipse.egit.ui.internal.provisional.wizards.IRepositorySearchResult; import org.eclipse.egit.ui.internal.provisional.wizards.NoRepositoryInfoException; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java index 3a8c8559..47f79bb0 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java @@ -16,8 +16,8 @@ import java.text.MessageFormat; import org.eclipse.core.commands.common.CommandException; import org.eclipse.core.expressions.IEvaluationContext; import org.eclipse.egit.github.core.PullRequest; -import org.eclipse.egit.ui.UIIcons; import org.eclipse.egit.ui.UIUtils; +import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.commit.CommitEditor; import org.eclipse.egit.ui.internal.commit.RepositoryCommit; import org.eclipse.jface.action.ToolBarManager; 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 ded701ca..5c52c150 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 @@ -14,7 +14,7 @@ import java.text.DateFormat; import java.text.MessageFormat; import org.eclipse.egit.github.core.RepositoryCommit; -import org.eclipse.egit.ui.UIIcons; +import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.StyledString; import org.eclipse.ui.model.WorkbenchAdapter; @@ -38,7 +38,7 @@ public class PullRequestCommitAdapter extends WorkbenchAdapter { /** * Get commit - * + * * @return commit */ public RepositoryCommit getCommit() { |