Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2017-07-18 15:16:18 -0400
committerMatthias Sohn2017-08-01 17:40:23 -0400
commit26e2a9fe3ae3b39db2651d6f8a890b2fd46dff20 (patch)
tree0fd6b491c91a35f4fe5d1dee5c603e1bb085de09
parent7a62c13e6bf251d2785725e18eaa7e32f4606397 (diff)
downloadegit-github-26e2a9fe3ae3b39db2651d6f8a890b2fd46dff20.tar.gz
egit-github-26e2a9fe3ae3b39db2651d6f8a890b2fd46dff20.tar.xz
egit-github-26e2a9fe3ae3b39db2651d6f8a890b2fd46dff20.zip
Remove deprecated access to mylyn.tasks
Now using new (redirected) values of several deprecated constants. Minimum version of mylyn.tasks.core has been increased to the version 3.9.0 where the new constants are declared. That minimum version is years behind the current version, so this does not really seem unfair to users of mylyn, as it does not enforce upgrading to a very recent version. Checked with egit-4.5 target platform. Change-Id: If49165fcaf4956079935a091887da6e5ad412316 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.mylyn.github-feature/feature.xml2
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java26
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/pr/PullRequestConnector.java16
-rw-r--r--org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF18
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/TaskRepositoryImportWizard.java2
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java4
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java3
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java4
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java4
9 files changed, 40 insertions, 39 deletions
diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml
index 6a358481..b9ba8877 100644
--- a/org.eclipse.mylyn.github-feature/feature.xml
+++ b/org.eclipse.mylyn.github-feature/feature.xml
@@ -20,7 +20,7 @@
<requires>
<import feature="org.eclipse.egit" version="3.2.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.mylyn_feature" version="3.7.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.mylyn_feature" version="3.9.0" match="greaterOrEqual"/>
<import plugin="com.google.gson" version="1.6" match="greaterOrEqual"/>
</requires>
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
index f93a3604..773ffca9 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java
@@ -67,7 +67,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Get repository label for id provider
- *
+ *
* @param repo
* @return label
*/
@@ -77,7 +77,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Create issue task repository
- *
+ *
* @param repo
* @param username
* @param password
@@ -94,13 +94,13 @@ public class IssueConnector extends RepositoryConnector {
repository.setCredentials(AuthenticationType.REPOSITORY,
new AuthenticationCredentials(username, password), true);
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
- IRepositoryConstants.CATEGORY_BUGS);
+ TaskRepository.CATEGORY_BUGS);
return repository;
}
/**
* Create client for repository
- *
+ *
* @param repository
* @return client
*/
@@ -131,7 +131,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Refresh labels for repository
- *
+ *
* @param repository
* @return labels
* @throws CoreException
@@ -155,7 +155,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Get labels for task repository.
- *
+ *
* @param repository
* @return non-null but possibly empty list of labels
*/
@@ -170,7 +170,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Are there cached labels for the specified task repository?
- *
+ *
* @param repository
* @return true if contains labels, false otherwise
*/
@@ -180,7 +180,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Refresh milestones for repository
- *
+ *
* @param repository
* @return milestones
* @throws CoreException
@@ -207,7 +207,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Get milestones for task repository.
- *
+ *
* @param repository
* @return non-null but possibly empty list of milestones
*/
@@ -222,7 +222,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* Are there cached milestones for the specified task repository?
- *
+ *
* @param repository
* @return true if contains milestones, false otherwise
*/
@@ -232,7 +232,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* {@inheritDoc}
- *
+ *
* @return always {@code true}
*/
@Override
@@ -242,7 +242,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* {@inheritDoc}
- *
+ *
* @return always {@code true}
*/
@Override
@@ -252,7 +252,7 @@ public class IssueConnector extends RepositoryConnector {
/**
* {@inheritDoc}
- *
+ *
* @see #KIND
*/
@Override
diff --git a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/pr/PullRequestConnector.java b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/pr/PullRequestConnector.java
index dc3aa24e..5009b84f 100644
--- a/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/pr/PullRequestConnector.java
+++ b/org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/pr/PullRequestConnector.java
@@ -58,7 +58,7 @@ public class PullRequestConnector extends RepositoryConnector {
/**
* Get repository label for id provider.
- *
+ *
* @param repo
* @return label
*/
@@ -69,7 +69,7 @@ public class PullRequestConnector extends RepositoryConnector {
/**
* Create pull request task repository
- *
+ *
* @param repo
* @param username
* @param password
@@ -86,13 +86,13 @@ public class PullRequestConnector extends RepositoryConnector {
repository.setCredentials(AuthenticationType.REPOSITORY,
new AuthenticationCredentials(username, password), true);
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
- IRepositoryConstants.CATEGORY_REVIEW);
+ TaskRepository.CATEGORY_REVIEW);
return repository;
}
/**
* Appends a trailing '/pull's segment to the given url
- *
+ *
* @param repoUrl
* @return appended string
*/
@@ -102,7 +102,7 @@ public class PullRequestConnector extends RepositoryConnector {
/**
* Strip trailing '/pulls' segment from string if it ends with it.
- *
+ *
* @param repoUrl
* @return stripped string
*/
@@ -115,7 +115,7 @@ public class PullRequestConnector extends RepositoryConnector {
/**
* Get pull request from task data
- *
+ *
* @param data
* @return pull request
*/
@@ -130,7 +130,7 @@ public class PullRequestConnector extends RepositoryConnector {
/**
* Get repository id from pull request task repository url
- *
+ *
* @param prRepoUrl
* @return repository id
*/
@@ -152,7 +152,7 @@ public class PullRequestConnector extends RepositoryConnector {
/**
* {@inheritDoc}
- *
+ *
* @see #KIND
*/
@Override
diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
index e0b4ffe7..4242ce04 100644
--- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF
@@ -10,19 +10,19 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.mylyn.tasks.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.mylyn.commons.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.mylyn.commons.net;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.mylyn.tasks.core;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.mylyn.commons.workbench;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.mylyn.tasks.core;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.mylyn.commons.ui;bundle-version="[3.9.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.mylyn.context.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[3.7.0,4.0.0)"
+ org.eclipse.mylyn.context.core;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.mylyn.monitor.core;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.mylyn.resources.ui;bundle-version="[3.9.0,4.0.0)"
Export-Package: org.eclipse.mylyn.internal.github.ui;version="4.9.0";x-internal:=true,
org.eclipse.mylyn.internal.github.ui.gist;version="4.9.0";x-internal:=true,
org.eclipse.mylyn.internal.github.ui.issue;version="4.9.0";x-internal:=true
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/TaskRepositoryImportWizard.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/TaskRepositoryImportWizard.java
index 3bdff129..f8928e47 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/TaskRepositoryImportWizard.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/TaskRepositoryImportWizard.java
@@ -104,7 +104,7 @@ public class TaskRepositoryImportWizard extends Wizard implements IImportWizard
repository.setCredentials(AuthenticationType.REPOSITORY,
credentials, true);
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
- IRepositoryConstants.CATEGORY_REVIEW);
+ TaskRepository.CATEGORY_REVIEW);
manager.addRepository(repository);
}
return true;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java
index 9804ce74..dbfe6624 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* Gist repository settings page class.
- *
+ *
* @author Kevin Sawicki (kevin@github.com)
*/
public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
@@ -127,7 +127,7 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
*/
public void applyTo(TaskRepository repository) {
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
- IRepositoryConstants.CATEGORY_REVIEW);
+ TaskRepository.CATEGORY_REVIEW);
super.applyTo(repository);
}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java
index 07cd95f5..7e52709d 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java
@@ -44,6 +44,7 @@ import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.progress.IProgressConstants2;
/**
* GitHub issue task editor attribute part that display labels and milestone
@@ -172,7 +173,7 @@ public class IssueAttributePart extends AbstractTaskEditorSection {
}
});
job.setUser(true);
- job.setProperty(WorkbenchUtil.SHOW_IN_TASKBAR_ICON_PROPERTY,
+ job.setProperty(IProgressConstants2.SHOW_IN_TASKBAR_ICON_PROPERTY,
Boolean.TRUE);
job.setPriority(Job.INTERACTIVE);
job.schedule();
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
index f433f53e..3f64b582 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
@@ -47,7 +47,7 @@ public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage
/**
* Populate taskRepository with repository settings.
- *
+ *
* @param taskRepository
* - Object to populate
*/
@@ -179,7 +179,7 @@ public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage
*/
public void applyTo(TaskRepository repository) {
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
- IRepositoryConstants.CATEGORY_BUGS);
+ TaskRepository.CATEGORY_BUGS);
super.applyTo(repository);
}
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java
index 291e77a9..b158fba1 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java
@@ -45,7 +45,7 @@ public class PullRequestRepositorySettingsPage extends
/**
* Create pull request repository settings page
- *
+ *
* @param taskRepository
*/
public PullRequestRepositorySettingsPage(final TaskRepository taskRepository) {
@@ -159,7 +159,7 @@ public class PullRequestRepositorySettingsPage extends
*/
public void applyTo(TaskRepository repository) {
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
- IRepositoryConstants.CATEGORY_REVIEW);
+ TaskRepository.CATEGORY_REVIEW);
super.applyTo(repository);
}

Back to the top