diff options
10 files changed, 26 insertions, 36 deletions
diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml index 91e867bf..8083acbb 100644 --- a/org.eclipse.mylyn.github-feature/feature.xml +++ b/org.eclipse.mylyn.github-feature/feature.xml @@ -19,15 +19,8 @@ </license> <requires> - <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.mylyn.tasks.core" version="3.2.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui.forms" version="3.4.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.mylyn.tasks.ui" version="3.2.0" match="greaterOrEqual"/> + <import feature="org.eclipse.mylyn_feature" version="3.7.0" match="greaterOrEqual"/> <import plugin="com.google.gson" version="1.6" match="greaterOrEqual"/> - <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/> </requires> <plugin diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF index 0f4475f0..778c4c27 100644 --- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF @@ -10,17 +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.4.0,4.0.0)", + org.eclipse.mylyn.tasks.ui;bundle-version="[3.7.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", - org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)", - org.eclipse.mylyn.tasks.core;bundle-version="[3.4.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.ui.ide;bundle-version="[3.5.0,4.0.0)", - org.eclipse.mylyn.commons.ui;bundle-version="[3.4.0,4.0.0)", + org.eclipse.mylyn.commons.ui;bundle-version="[3.7.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.4.0,4.0.0)", - org.eclipse.mylyn.monitor.core;bundle-version="[3.4.0,4.0.0)", - org.eclipse.mylyn.resources.ui;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)" Export-Package: org.eclipse.mylyn.internal.github.ui;version="2.0.0";x-internal:=true, org.eclipse.mylyn.internal.github.ui.gist;version="2.0.0";x-internal:=true, org.eclipse.mylyn.internal.github.ui.issue;version="2.0.0";x-internal:=true diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPart.java index 661324ce..dd67b5a0 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPart.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPart.java @@ -30,9 +30,9 @@ import org.eclipse.jface.viewers.OpenEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.window.ToolTip; -import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil; -import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; -import org.eclipse.mylyn.internal.provisional.commons.ui.TableViewerSupport; +import org.eclipse.mylyn.commons.ui.CommonImages; +import org.eclipse.mylyn.commons.ui.TableViewerSupport; +import org.eclipse.mylyn.commons.workbench.forms.CommonFormUtil; import org.eclipse.mylyn.internal.tasks.core.TaskAttachment; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.commands.OpenTaskAttachmentHandler; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentSorter.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentSorter.java index c4e9f8f8..a64cd265 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentSorter.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentSorter.java @@ -11,8 +11,8 @@ package org.eclipse.mylyn.internal.github.ui.gist; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.mylyn.internal.provisional.commons.ui.TableSorter; -import org.eclipse.mylyn.internal.tasks.ui.views.TaskKeyComparator; +import org.eclipse.mylyn.commons.core.CoreUtil; +import org.eclipse.mylyn.commons.ui.TableSorter; import org.eclipse.mylyn.tasks.core.ITaskAttachment; /** @@ -29,11 +29,11 @@ public class GistAttachmentSorter extends TableSorter { ITaskAttachment attachment2 = (ITaskAttachment) e2; switch (columnIndex) { case 0: - return compare(attachment1.getFileName(), attachment2.getFileName()); + return CoreUtil.compare(attachment1.getFileName(), attachment2.getFileName()); case 1: - return compare(attachment1.getLength(), attachment2.getLength()); + return CoreUtil.compare(attachment1.getLength(), attachment2.getLength()); case 2: - return compare(attachment1.getAuthor().toString(), attachment2 + return CoreUtil.compare(attachment1.getAuthor().toString(), attachment2 .getAuthor().toString()); default: return super.compare(viewer, e1, e2, columnIndex); diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java index e669de29..9566e56e 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistNotificationPopup.java @@ -13,8 +13,8 @@ package org.eclipse.mylyn.internal.github.ui.gist; import java.text.MessageFormat; import org.eclipse.egit.github.core.Gist; +import org.eclipse.mylyn.commons.ui.dialogs.AbstractNotificationPopup; import org.eclipse.mylyn.internal.github.ui.GitHubImages; -import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup; import org.eclipse.mylyn.internal.tasks.core.AbstractTask; import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; import org.eclipse.mylyn.tasks.core.TaskRepository; 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 a7498e25..07cd95f5 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 @@ -21,9 +21,9 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.mylyn.commons.workbench.WorkbenchUtil; +import org.eclipse.mylyn.commons.workbench.forms.CommonFormUtil; import org.eclipse.mylyn.internal.github.core.issue.IssueAttribute; -import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil; -import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil; import org.eclipse.mylyn.internal.tasks.ui.editors.AbstractTaskEditorSection; import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil; import org.eclipse.mylyn.internal.tasks.ui.editors.Messages; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java index 64766980..5785df3c 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java @@ -24,7 +24,6 @@ import org.eclipse.jface.text.hyperlink.URLHyperlink; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.mylyn.internal.github.core.GitHub; -import org.eclipse.mylyn.internal.github.core.issue.IssueAttribute; import org.eclipse.mylyn.internal.github.core.issue.IssueConnector; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.core.ITask; diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java index b354bb28..7f6d261b 100644 --- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java +++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositoryQueryPage.java @@ -33,13 +33,13 @@ import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.mylyn.commons.core.ICoreRunnable; import org.eclipse.mylyn.commons.net.Policy; +import org.eclipse.mylyn.commons.ui.CommonUiUtil; import org.eclipse.mylyn.internal.github.core.QueryUtils; import org.eclipse.mylyn.internal.github.core.issue.IssueConnector; import org.eclipse.mylyn.internal.github.ui.GitHubImages; import org.eclipse.mylyn.internal.github.ui.GitHubRepositoryQueryPage; -import org.eclipse.mylyn.internal.provisional.commons.ui.CommonUiUtil; -import org.eclipse.mylyn.internal.provisional.commons.ui.ICoreRunnable; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiImages; 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 c3e9d5b0..291e77a9 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 @@ -10,7 +10,6 @@ *****************************************************************************/ package org.eclipse.mylyn.internal.github.ui.pr; -import java.io.IOException; import java.text.MessageFormat; import org.eclipse.core.runtime.CoreException; @@ -20,11 +19,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.egit.github.core.RepositoryId; import org.eclipse.egit.github.core.client.GitHubClient; import org.eclipse.egit.github.core.client.NoSuchPageException; -import org.eclipse.egit.github.core.client.PageIterator; import org.eclipse.egit.github.core.service.IssueService; import org.eclipse.egit.github.core.service.PullRequestService; -import org.eclipse.mylyn.commons.net.AuthenticationCredentials; -import org.eclipse.mylyn.commons.net.AuthenticationType; import org.eclipse.mylyn.internal.github.core.GitHub; import org.eclipse.mylyn.internal.github.core.GitHubException; import org.eclipse.mylyn.internal.github.core.issue.IssueConnector; @@ -43,7 +43,7 @@ <tycho-version>0.13.0</tycho-version> <egit-site>file:/${basedir}/../../egit/org.eclipse.egit-updatesite/target/site</egit-site> <platform-version-name>indigo</platform-version-name> - <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site> + <mylyn-site>http://download.eclipse.org/mylyn/releases/3.7</mylyn-site> <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository</orbit-site> <download-publish-path>/home/data/httpd/download.eclipse.org/egit/github/updates-nightly</download-publish-path> @@ -77,9 +77,9 @@ <url>${orbit-site}</url> </repository> <repository> - <id>wikitext</id> + <id>mylyn</id> <layout>p2</layout> - <url>${wikitext-site}</url> + <url>${mylyn-site}</url> </repository> </repositories> |