Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2017-07-18 19:16:18 +0000
committerMatthias Sohn2017-08-01 21:40:23 +0000
commit26e2a9fe3ae3b39db2651d6f8a890b2fd46dff20 (patch)
tree0fd6b491c91a35f4fe5d1dee5c603e1bb085de09 /org.eclipse.mylyn.github.ui
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>
Diffstat (limited to 'org.eclipse.mylyn.github.ui')
-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
6 files changed, 18 insertions, 17 deletions
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