Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2019-03-06 09:40:39 -0500
committerMatthias Sohn2019-03-06 09:41:41 -0500
commit0cfacb54fd46767fdc798babeab3783b98d51870 (patch)
treebbde0f6a1c947f5dc2185f2ac1ec0c238da0cfeb
parentf36f2823a3549000f182bffe9c49a9483cf8de41 (diff)
parent34ce4e2d76fe171a84d5be1ba3abb328027e47d5 (diff)
downloadegit-github-0cfacb54fd46767fdc798babeab3783b98d51870.tar.gz
egit-github-0cfacb54fd46767fdc798babeab3783b98d51870.tar.xz
egit-github-0cfacb54fd46767fdc798babeab3783b98d51870.zip
Merge branch 'master' into stable-5.3
* master: Update Orbit to R20190226160451 and sync dependencies with jgit and egit Write GitHub with capital H Wizards shall have a description Silence all discouraged access warnings in Java code Change-Id: I5ffb24ab4cd5cca06ce6539ddd50712544bae246 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Repository.java7
-rw-r--r--org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java2
-rw-r--r--org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java2
-rw-r--r--org.eclipse.mylyn.github-feature/feature.properties2
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java1
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/pr/PullRequestConnector.java1
-rw-r--r--org.eclipse.mylyn.github.target/.project6
-rw-r--r--org.eclipse.mylyn.github.target/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.github.target/github.target26
-rw-r--r--org.eclipse.mylyn.github.target/github.tpd2
-rw-r--r--org.eclipse.mylyn.github.target/orbit/R20190226160451-2019-03.tpd73
-rw-r--r--org.eclipse.mylyn.github.target/pom.xml2
-rw-r--r--org.eclipse.mylyn.github.ui/plugin.properties2
-rw-r--r--org.eclipse.mylyn.github.ui/plugin.xml6
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java8
-rwxr-xr-xorg.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/TaskRepositoryImportWizard.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java3
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentPart.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentTableLabelProvider.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorSelectionDialog.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositoryQueryPage.java6
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java8
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java7
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueAttributePart.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java16
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java5
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java7
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/CommitAttributePart.java1
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java5
30 files changed, 177 insertions, 29 deletions
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Repository.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Repository.java
index 10864a6d..86936065 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Repository.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/Repository.java
@@ -12,13 +12,13 @@
*****************************************************************************/
package org.eclipse.egit.github.core;
+import com.google.gson.annotations.SerializedName;
+
import java.io.Serializable;
import java.util.Date;
import org.eclipse.egit.github.core.util.DateUtils;
-import com.google.gson.annotations.SerializedName;
-
/**
* Repository model class
*/
@@ -57,7 +57,7 @@ public class Repository implements IRepositoryIdProvider, Serializable {
private int stargazersCount;
- /** This is what Github shows as "watchers". */
+ /** This is what GitHub shows as "watchers". */
private int subscribersCount = -1;
private Repository parent;
@@ -562,6 +562,7 @@ public class Repository implements IRepositoryIdProvider, Serializable {
*
* @see IRepositoryIdProvider#generateId()
*/
+ @Override
public String generateId() {
final User owner = this.owner;
final String name = this.name;
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java
index f958004a..81c2a270 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/User.java
@@ -69,7 +69,7 @@ public class User implements Serializable {
private String email;
- // Github legacy field; needs to be kept for proper deserialization.
+ // GitHub legacy field; needs to be kept for proper deserialization.
@SuppressWarnings("unused")
private String gravatarId;
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java
index 28c9d45b..e135a456 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/service/TeamService.java
@@ -280,7 +280,7 @@ public class TeamService extends GitHubService {
request.setType(TeamMembership.class);
// According to
// https://developer.github.com/v3/teams/members/#get-team-membership
- // Github returns a 404 if the user is not a member of the team, which
+ // GitHub returns a 404 if the user is not a member of the team, which
// the GitHubClient translates into an IOException. Is that correct?
return (TeamMembership) client.get(request).getBody();
}
diff --git a/org.eclipse.mylyn.github-feature/feature.properties b/org.eclipse.mylyn.github-feature/feature.properties
index d750f296..f68092a3 100644
--- a/org.eclipse.mylyn.github-feature/feature.properties
+++ b/org.eclipse.mylyn.github-feature/feature.properties
@@ -15,7 +15,7 @@ featureName=Eclipse GitHub integration with task focused interface
providerName=Eclipse EGit
# description property - text of the "Feature Descrption"
-description=Integration with Github
+description=Integration with GitHub
################ end of description property ##################################
# "copyright" property - text of the "Feature Update Copyright"
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 0055864c..e93e3ced 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
@@ -59,6 +59,7 @@ import org.eclipse.mylyn.tasks.core.sync.ISynchronizationSession;
/**
* GitHub issue repository connector.
*/
+@SuppressWarnings("restriction")
public class IssueConnector extends RepositoryConnector {
/**
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 6ff999f0..7aecec05 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
@@ -46,6 +46,7 @@ import org.eclipse.mylyn.tasks.core.sync.ISynchronizationSession;
/**
* GitHub pull request connector.
*/
+@SuppressWarnings("restriction")
public class PullRequestConnector extends RepositoryConnector {
/**
diff --git a/org.eclipse.mylyn.github.target/.project b/org.eclipse.mylyn.github.target/.project
index cc40ee13..5951f612 100644
--- a/org.eclipse.mylyn.github.target/.project
+++ b/org.eclipse.mylyn.github.target/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -13,5 +18,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.mylyn.github.target/MANIFEST.MF b/org.eclipse.mylyn.github.target/MANIFEST.MF
index 12bc5cd5..9a1c26dc 100644
--- a/org.eclipse.mylyn.github.target/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.target/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: EGit Mylyn Github Target Platform Bundle
+Bundle-Name: EGit Mylyn GitHub Target Platform Bundle
Bundle-SymbolicName: org.eclipse.mylyn.github.target
Bundle-Version: 5.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.mylyn.github.target/github.target b/org.eclipse.mylyn.github.target/github.target
index 6059610f..9bd665ca 100644
--- a/org.eclipse.mylyn.github.target/github.target
+++ b/org.eclipse.mylyn.github.target/github.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="github" sequenceNumber="1544020137">
+<target name="github" sequenceNumber="1551857436">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -44,16 +44,22 @@
<unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
- <unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
- <unit id="org.apache.commons.compress.source" version="1.15.0.v20180119-1613"/>
+ <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
+ <unit id="org.apache.commons.compress.source" version="1.18.0.v20181121-2221"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.5.v20180409-1525"/>
- <unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/>
- <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.9.v20180409-1525"/>
+ <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>
+ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
+ <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
+ <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+ <unit id="org.bouncycastle.bcpg" version="1.60.0.v20181210-2057"/>
+ <unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181210-2057"/>
+ <unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
+ <unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181210-2057"/>
+ <unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
+ <unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181210-2057"/>
<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -81,8 +87,8 @@
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
- <unit id="org.tukaani.xz" version="1.6.0.v20170629-1752"/>
- <unit id="org.tukaani.xz.source" version="1.6.0.v20170629-1752"/>
+ <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
+ <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
<unit id="com.jcraft.jzlib" version="1.1.1.v201205102305"/>
<unit id="com.jcraft.jzlib.source" version="1.1.1.v201205102305"/>
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
@@ -91,7 +97,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.github.target/github.tpd b/org.eclipse.mylyn.github.target/github.tpd
index dff0027f..f71ba9f5 100644
--- a/org.eclipse.mylyn.github.target/github.tpd
+++ b/org.eclipse.mylyn.github.target/github.tpd
@@ -2,5 +2,5 @@ target "github" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/R20181128170323-2018-12.tpd"
+include "orbit/R20190226160451-2019-03.tpd"
include "releasetrain/4.7-oxygen.tpd" \ No newline at end of file
diff --git a/org.eclipse.mylyn.github.target/orbit/R20190226160451-2019-03.tpd b/org.eclipse.mylyn.github.target/orbit/R20190226160451-2019-03.tpd
new file mode 100644
index 00000000..c77414f9
--- /dev/null
+++ b/org.eclipse.mylyn.github.target/orbit/R20190226160451-2019-03.tpd
@@ -0,0 +1,73 @@
+target "R20190226160451-2019-03" with source configurePhase
+// see http://download.eclipse.org/tools/orbit/downloads/
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository" {
+ com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
+ com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
+ com.jcraft.jsch [0.1.54.v20170116-1932,0.1.54.v20170116-1932]
+ com.jcraft.jsch.source [0.1.54.v20170116-1932,0.1.54.v20170116-1932]
+ javaewah [1.1.6.v20160919-1400,1.1.6.v20160919-1400]
+ javaewah.source [1.1.6.v20160919-1400,1.1.6.v20160919-1400]
+ javax.activation [1.1.0.v201211130549,1.1.0.v201211130549]
+ javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
+ javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
+ javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648]
+ javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200]
+ org.apache.ant [1.10.5.v20180808-0324,1.10.5.v20180808-0324]
+ org.apache.ant.source [1.10.5.v20180808-0324,1.10.5.v20180808-0324]
+ org.apache.commons.codec [1.10.0.v20180409-1845,1.10.0.v20180409-1845]
+ org.apache.commons.codec.source [1.10.0.v20180409-1845,1.10.0.v20180409-1845]
+ org.apache.commons.compress [1.18.0.v20181121-2221,1.18.0.v20181121-2221]
+ org.apache.commons.compress.source [1.18.0.v20181121-2221,1.18.0.v20181121-2221]
+ org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+ org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
+ org.apache.httpcomponents.httpclient [4.5.6.v20190213-1430,4.5.6.v20190213-1430]
+ org.apache.httpcomponents.httpclient.source [4.5.6.v20190213-1430,4.5.6.v20190213-1430]
+ org.apache.httpcomponents.httpcore [4.4.10.v20190123-2214,4.4.10.v20190123-2214]
+ org.apache.httpcomponents.httpcore.source [4.4.10.v20190123-2214,4.4.10.v20190123-2214]
+ org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
+ org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
+ org.bouncycastle.bcpg [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+ org.bouncycastle.bcpg.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+ org.bouncycastle.bcpkix [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+ org.bouncycastle.bcpkix.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+ org.bouncycastle.bcprov [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+ org.bouncycastle.bcprov.source [1.60.0.v20181210-2057,1.60.0.v20181210-2057]
+ org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+ org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
+ org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000]
+ org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+ org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+ org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900]
+ org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900]
+ org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900]
+ org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900]
+ org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+ org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+ org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000]
+ org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000]
+ org.junit [4.12.0.v201504281640,4.12.0.v201504281640]
+ org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
+ org.mockito [2.13.0.v20180426-1843,2.13.0.v20180426-1843]
+ org.mockito.source [2.13.0.v20180426-1843,2.13.0.v20180426-1843]
+ net.bytebuddy.byte-buddy [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ net.bytebuddy.byte-buddy.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ net.bytebuddy.byte-buddy-agent [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ net.bytebuddy.byte-buddy-agent.source [1.7.9.v20180420-1519,1.7.9.v20180420-1519]
+ org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+ org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
+ org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+ org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+ org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+ org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+ org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
+ org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613]
+ com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
+ com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
+ net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+ net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
+ org.apache.sshd.core [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+ org.apache.sshd.core.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+ org.apache.sshd.sftp [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+ org.apache.sshd.sftp.source [2.0.0.v20181102-1323,2.0.0.v20181102-1323]
+}
diff --git a/org.eclipse.mylyn.github.target/pom.xml b/org.eclipse.mylyn.github.target/pom.xml
index c67e2726..d45e5afd 100644
--- a/org.eclipse.mylyn.github.target/pom.xml
+++ b/org.eclipse.mylyn.github.target/pom.xml
@@ -15,7 +15,7 @@
<artifactId>org.eclipse.mylyn.github.target</artifactId>
<packaging>pom</packaging>
- <name>EGit Github Target Platform Definition</name>
+ <name>EGit GitHub Target Platform Definition</name>
<parent>
<artifactId>github-parent</artifactId>
diff --git a/org.eclipse.mylyn.github.ui/plugin.properties b/org.eclipse.mylyn.github.ui/plugin.properties
index ebc9d4b4..163bff3b 100644
--- a/org.eclipse.mylyn.github.ui/plugin.properties
+++ b/org.eclipse.mylyn.github.ui/plugin.properties
@@ -5,11 +5,13 @@ gistUiConnectorName=GitHub Gist repository connector UI
pluginName=Mylyn GitHub Connector UI
providerName=Eclipse EGit
importRepositoriesWizardName=GitHub Task Repositories
+importRepositoriesWizardDescription=Import task repositories from GitHub
githubMenuLabel=GitHub
createGistPublicParamName=Public Gist
createPublicGistLabel=Create Public Gist
createPrivateGistLabel=Create Private Gist
cloneRepositoriesWizardName=Repositories from GitHub
+cloneRepositoriesWizardDescription=Import one or more projects from GitHub
pullRequestConnectorCore=GitHub Pull Requests
pullRequestConnectorUi=GitHub Pull Requests
checkoutPullRequest.name=Checkout Pull Request
diff --git a/org.eclipse.mylyn.github.ui/plugin.xml b/org.eclipse.mylyn.github.ui/plugin.xml
index 32cc27b9..3ae94d7d 100644
--- a/org.eclipse.mylyn.github.ui/plugin.xml
+++ b/org.eclipse.mylyn.github.ui/plugin.xml
@@ -260,6 +260,9 @@
icon="icons/obj16/github.png"
id="org.eclipse.mylyn.github.ui.importRepositoriesWizard"
name="%importRepositoriesWizardName">
+ <description>
+ %importRepositoriesWizardDescription
+ </description>
</wizard>
</extension>
<extension
@@ -270,6 +273,9 @@
icon="icons/obj16/github.png"
id="org.eclipse.mylyn.github.ui.cloneRepositoriesWizard"
name="%cloneRepositoriesWizardName">
+ <description>
+ %cloneRepositoriesWizardDescription
+ </description>
</wizard>
</extension>
<extension
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java
index f4950495..42dc492f 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/GitHubImages.java
@@ -35,10 +35,10 @@ public class GitHubImages {
private static ImageRegistry manager;
- /** Key for the Github logo icon. */
+ /** Key for the GitHub logo icon. */
public static final String GITHUB_LOGO_OBJ = NAME_PREFIX + "OBJ_GITHUB_LOGO"; //$NON-NLS-1$
- /** Key for a Github issue label icon. */
+ /** Key for a GitHub issue label icon. */
public static final String GITHUB_ISSUE_LABEL_OBJ = NAME_PREFIX + "OBJ_GITHUB_ISSUE_LABEL"; //$NON-NLS-1$
/** Key for an "add" icon. */
@@ -53,10 +53,10 @@ public class GitHubImages {
/** Key for an organization icon. */
public static final String GITHUB_ORG = NAME_PREFIX + "GITHUB_ORG"; //$NON-NLS-1$
- /** {@link ImageDescriptor} for the Github logo icon. */
+ /** {@link ImageDescriptor} for the GitHub logo icon. */
public static final ImageDescriptor DESC_GITHUB_LOGO = create(PATH_OBJ, "github.png"); //$NON-NLS-1$
- /** {@link ImageDescriptor} for the Github issue label icon. */
+ /** {@link ImageDescriptor} for the GitHub issue label icon. */
public static final ImageDescriptor DESC_GITHUB_ISSUE_LABEL = create(PATH_OBJ, "issue_label.png"); //$NON-NLS-1$
/** {@link ImageDescriptor} for the "add" icon. */
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java
index e450f25c..706759c3 100755
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java
@@ -48,6 +48,7 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
/**
* {@link IImportWizard} for cloning GitHub repositories.
*/
+@SuppressWarnings("restriction")
public class RepositoryImportWizard extends Wizard implements IImportWizard {
private final RepositorySearchWizardPage repositorySearchWizardPage = new RepositorySearchWizardPage();
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 17368550..40616f43 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
@@ -37,6 +37,7 @@ import org.eclipse.ui.internal.WorkbenchImages;
*
* @author Kevin Sawicki (kevin@github.com)
*/
+@SuppressWarnings("restriction")
public class TaskRepositoryImportWizard extends Wizard implements IImportWizard {
private CredentialsWizardPage credentialsPage;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java
index c368bbbd..f0030a86 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistJob.java
@@ -32,6 +32,7 @@ import org.eclipse.ui.PlatformUI;
/**
* Create Gist job class
*/
+@SuppressWarnings("restriction")
public class CreateGistJob extends Job {
private String title;
@@ -61,7 +62,6 @@ public class CreateGistJob extends Job {
}
@Override
- @SuppressWarnings("restriction")
protected IStatus run(IProgressMonitor monitor) {
try {
Gist gist = new Gist().setPublic(isPublic);
@@ -72,6 +72,7 @@ public class CreateGistJob extends Job {
final Display display = PlatformUI.getWorkbench().getDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
GistNotificationPopup popup = new GistNotificationPopup(
display, created, title, repository);
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 9ed959e7..82e26477 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
@@ -71,6 +71,7 @@ import org.eclipse.ui.forms.widgets.Section;
* Gist editor attachment part. Modeled after {@link TaskEditorAttachmentPart}
* but with less columns.
*/
+@SuppressWarnings("restriction")
public class GistAttachmentPart extends AbstractTaskEditorPart {
private static final String ID_POPUP_MENU = "org.eclipse.mylyn.tasks.ui.editor.menu.attachments"; //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentTableLabelProvider.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentTableLabelProvider.java
index aa64c1d2..2e3feac2 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentTableLabelProvider.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistAttachmentTableLabelProvider.java
@@ -51,6 +51,7 @@ import org.eclipse.ui.PlatformUI;
* AttachmentTableLabelProvider directly. Unfortunately, that class changed
* in non-compatible ways with Mylyn Tasks 3.23.0.
*/
+@SuppressWarnings("restriction")
public class GistAttachmentTableLabelProvider extends ColumnLabelProvider {
private final AttachmentSizeFormatter sizeFormatter = AttachmentSizeFormatter.getInstance();
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorSelectionDialog.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorSelectionDialog.java
index 9ce51915..c0112fd5 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorSelectionDialog.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistConnectorSelectionDialog.java
@@ -37,6 +37,7 @@ import org.eclipse.ui.dialogs.SelectionDialog;
/**
* Dialog to select a Gist task repository
*/
+@SuppressWarnings("restriction")
public class GistConnectorSelectionDialog extends SelectionDialog {
private final Collection<TaskRepository> repos;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositoryQueryPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositoryQueryPage.java
index 918fc1b6..9827a5a7 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositoryQueryPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositoryQueryPage.java
@@ -32,6 +32,7 @@ import org.eclipse.swt.widgets.Text;
/**
* Gist repository query page class.
*/
+@SuppressWarnings("restriction")
public class GistRepositoryQueryPage extends AbstractRepositoryQueryPage {
private Text titleText;
@@ -59,6 +60,7 @@ public class GistRepositoryQueryPage extends AbstractRepositoryQueryPage {
/**
* @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);
initializeDialogUnits(displayArea);
@@ -69,6 +71,7 @@ public class GistRepositoryQueryPage extends AbstractRepositoryQueryPage {
ModifyListener completeListener = new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
setPageComplete(isPageComplete());
}
@@ -119,6 +122,7 @@ public class GistRepositoryQueryPage extends AbstractRepositoryQueryPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#getQueryTitle()
*/
+ @Override
public String getQueryTitle() {
return titleText != null ? titleText.getText() : null;
}
@@ -126,6 +130,7 @@ public class GistRepositoryQueryPage extends AbstractRepositoryQueryPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#isPageComplete()
*/
+ @Override
public boolean isPageComplete() {
boolean complete = inSearchContainer() ? true : super.isPageComplete();
if (complete)
@@ -136,6 +141,7 @@ public class GistRepositoryQueryPage extends AbstractRepositoryQueryPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage#applyTo(org.eclipse.mylyn.tasks.core.IRepositoryQuery)
*/
+ @Override
public void applyTo(IRepositoryQuery query) {
query.setSummary(getQueryTitle());
query.setAttribute(IGistQueryConstants.USER, userText.getText().trim());
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 bedfbb29..c589f00d 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
@@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.Composite;
*
* @author Kevin Sawicki (kevin@github.com)
*/
+@SuppressWarnings("restriction")
public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
@@ -56,6 +57,7 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#getConnectorKind()
*/
+ @Override
public String getConnectorKind() {
return GistConnector.KIND;
}
@@ -63,6 +65,7 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#createAdditionalControls(org.eclipse.swt.widgets.Composite)
*/
+ @Override
protected void createAdditionalControls(Composite parent) {
if (repository == null) {
setUrl(URL);
@@ -74,6 +77,7 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#isValidUrl(java.lang.String)
*/
+ @Override
protected boolean isValidUrl(String url) {
if (url.startsWith("http://") || url.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$
try {
@@ -89,9 +93,11 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#getValidator(org.eclipse.mylyn.tasks.core.TaskRepository)
*/
+ @Override
protected Validator getValidator(final TaskRepository repository) {
return new Validator() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
monitor.beginTask(
Messages.GistRepositorySettingsPage_TaskValidating, 100);
@@ -127,6 +133,7 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#applyTo(org.eclipse.mylyn.tasks.core.TaskRepository)
*/
+ @Override
public void applyTo(TaskRepository repository) {
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
TaskRepository.CATEGORY_REVIEW);
@@ -136,6 +143,7 @@ public class GistRepositorySettingsPage extends AbstractRepositorySettingsPage {
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#canValidate()
*/
+ @Override
public boolean canValidate() {
return isPageComplete()
&& (getMessage() == null || getMessageType() != IMessageProvider.ERROR);
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java
index b86ad9b6..109a3e30 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistTaskEditorPage.java
@@ -33,6 +33,7 @@ import org.eclipse.ui.menus.CommandContributionItemParameter;
/**
* Gist task editor page class
*/
+@SuppressWarnings("restriction")
public class GistTaskEditorPage extends AbstractTaskEditorPage {
/**
@@ -63,6 +64,7 @@ public class GistTaskEditorPage extends AbstractTaskEditorPage {
/**
* @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage#fillToolBar(org.eclipse.jface.action.IToolBarManager)
*/
+ @Override
public void fillToolBar(IToolBarManager toolBarManager) {
super.fillToolBar(toolBarManager);
addCloneAction(toolBarManager);
@@ -71,6 +73,7 @@ public class GistTaskEditorPage extends AbstractTaskEditorPage {
/**
* @see org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage#createPartDescriptors()
*/
+ @Override
protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
Set<TaskEditorPartDescriptor> partDescriptors = super
.createPartDescriptors();
@@ -87,6 +90,7 @@ public class GistTaskEditorPage extends AbstractTaskEditorPage {
if (!getModel().getTaskData().isNew()) {
partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_SUMMARY) {
+ @Override
public AbstractTaskEditorPart createPart() {
return new IssueSummaryPart(GistAttribute.AUTHOR_GRAVATAR
.getMetadata().getId(), null);
@@ -95,6 +99,7 @@ public class GistTaskEditorPage extends AbstractTaskEditorPage {
partDescriptors.add(new TaskEditorPartDescriptor(
ID_PART_ATTACHMENTS) {
+ @Override
public AbstractTaskEditorPart createPart() {
return new GistAttachmentPart();
}
@@ -102,9 +107,11 @@ public class GistTaskEditorPage extends AbstractTaskEditorPage {
}
partDescriptors.add(new TaskEditorPartDescriptor(ID_PART_ACTIONS) {
+ @Override
public AbstractTaskEditorPart createPart() {
return new TaskEditorActionPart() {
+ @Override
protected void addAttachContextButton(
Composite buttonComposite, FormToolkit toolkit) {
// Prohibit context button since Gists don't support
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 ba24e14d..e34cd266 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
@@ -51,6 +51,7 @@ import org.eclipse.ui.progress.IProgressConstants2;
* GitHub issue task editor attribute part that display labels and milestone
* attribute editors.
*/
+@SuppressWarnings("restriction")
public class IssueAttributePart extends AbstractTaskEditorSection {
private List<AbstractAttributeEditor> attributeEditors;
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java
index ff167e51..a6787b96 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueLabelAttributeEditor.java
@@ -52,6 +52,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
/**
* Editor part for viewing an issue's labels.
*/
+@SuppressWarnings("restriction")
public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
/**
@@ -71,12 +72,14 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
IAction.AS_PUSH_BUTTON);
}
+ @Override
public void run() {
InputDialog dialog = new InputDialog(getControl().getShell(),
Messages.IssueLabelAttributeEditor_TitleNewLabel,
Messages.IssueLabelAttributeEditor_DescriptionNewLabel,
"", new IInputValidator() { //$NON-NLS-1$
+ @Override
public String isValid(String newText) {
if (newText == null || newText.trim().length() == 0)
return Messages.IssueLabelAttributeEditor_MessageEnterName;
@@ -104,6 +107,7 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
this.label = label;
}
+ @Override
public void run() {
if (getTaskAttribute().getValues().contains(label)) {
getTaskAttribute().removeValue(label);
@@ -121,6 +125,7 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
setImageDescriptor(GitHubImages.DESC_GITHUB_ISSUE_LABEL);
}
+ @Override
public void run() {
if (!getTaskAttribute().getValues().contains(getText())) {
getTaskAttribute().addValue(getText());
@@ -133,10 +138,11 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
private Composite displayArea;
private boolean layout = false;
private Composite labelsArea;
- private List<CLabel> labelControls = new LinkedList<CLabel>();
+ private List<CLabel> labelControls = new LinkedList<>();
private FormToolkit toolkit;
private Comparator<String> labelComparator = new Comparator<String>() {
+ @Override
public int compare(String o1, String o2) {
return o1.compareToIgnoreCase(o2);
}
@@ -159,7 +165,7 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
Image labelImage = GitHubImages
.get(GitHubImages.GITHUB_ISSUE_LABEL_OBJ);
- List<String> labels = new LinkedList<String>(getTaskAttribute()
+ List<String> labels = new LinkedList<>(getTaskAttribute()
.getValues());
Collections.sort(labels, this.labelComparator);
if (!labels.isEmpty())
@@ -169,6 +175,7 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
manager.setRemoveAllWhenShown(true);
manager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
manager.add(new RemoveLabelAction(label));
}
@@ -199,6 +206,7 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
* @see org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor#createControl(org.eclipse.swt.widgets.Composite,
* org.eclipse.ui.forms.widgets.FormToolkit)
*/
+ @Override
public void createControl(Composite parent, FormToolkit toolkit) {
this.toolkit = toolkit;
displayArea = toolkit.createComposite(parent);
@@ -216,10 +224,11 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
manager.setRemoveAllWhenShown(true);
manager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
manager.add(new NewLabelAction());
manager.add(new Separator());
- List<String> labels = new LinkedList<String>(getTaskAttribute()
+ List<String> labels = new LinkedList<>(getTaskAttribute()
.getOptions().values());
labels.removeAll(getTaskAttribute().getValues());
for (String label : labels)
@@ -230,6 +239,7 @@ public class IssueLabelAttributeEditor extends AbstractAttributeEditor {
final Menu menu = manager.createContextMenu(displayArea);
addItem.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
Rectangle toolItemBounds = addItem.getBounds();
Point location = toolbar.toDisplay(toolItemBounds.x,
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 d14a93d3..5e01c87b 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
@@ -42,6 +42,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* GitHub connector specific extensions.
*/
+@SuppressWarnings("restriction")
public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage {
private boolean syncLabel = true;
@@ -100,6 +101,7 @@ public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage
serverUrlCombo.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
editingUrl = true;
try {
@@ -113,6 +115,7 @@ public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage
repositoryLabelEditor.getTextControl(compositeContainer)
.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
if (!editingUrl)
syncLabel = false;
@@ -179,6 +182,7 @@ public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#applyTo(org.eclipse.mylyn.tasks.core.TaskRepository)
*/
+ @Override
public void applyTo(TaskRepository repository) {
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
TaskRepository.CATEGORY_BUGS);
@@ -188,6 +192,7 @@ public class IssueRepositorySettingsPage extends AbstractRepositorySettingsPage
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#canValidate()
*/
+ @Override
public boolean canValidate() {
return isPageComplete()
&& (getMessage() == null || getMessageType() != IMessageProvider.ERROR);
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java
index fe862f6f..f786839b 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueSummaryPart.java
@@ -34,6 +34,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
* Issue summary task editor part modeled after {@link TaskEditorSummaryPart}
* but displaying reporter and assignee avatar images.
*/
+@SuppressWarnings("restriction")
public class IssueSummaryPart extends AbstractTaskEditorPart {
/**
@@ -49,7 +50,7 @@ public class IssueSummaryPart extends AbstractTaskEditorPart {
/**
* Create issue summary part
- *
+ *
* @param reporterAvatarId
* @param assigneeAvatarId
*/
@@ -150,10 +151,11 @@ public class IssueSummaryPart extends AbstractTaskEditorPart {
/**
* Create control
- *
+ *
* @param parent
* @param toolkit
*/
+ @Override
public void createControl(Composite parent, FormToolkit toolkit) {
Composite composite = toolkit.createComposite(parent);
GridLayout layout = EditorUtil.createSectionClientLayout();
@@ -232,6 +234,7 @@ public class IssueSummaryPart extends AbstractTaskEditorPart {
/**
* @see org.eclipse.ui.forms.AbstractFormPart#setFocus()
*/
+ @Override
public void setFocus() {
if (summaryEditor != null)
summaryEditor.getControl().setFocus();
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 f4fedef9..58aaa2b7 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
@@ -64,6 +64,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
/**
* Task editor section to view commits attached to a pull request
*/
+@SuppressWarnings("restriction")
public class CommitAttributePart extends AbstractTaskEditorSection {
private CommandContributionItem fetchCommits;
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 c8f788cc..0b8ea9ca 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
@@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* Pull request task repository settings page.
*/
+@SuppressWarnings("restriction")
public class PullRequestRepositorySettingsPage extends
HttpRepositorySettingsPage {
@@ -92,6 +93,7 @@ public class PullRequestRepositorySettingsPage extends
serverUrlCombo.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
editingUrl = true;
try {
@@ -105,6 +107,7 @@ public class PullRequestRepositorySettingsPage extends
repositoryLabelEditor.getTextControl(compositeContainer)
.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
if (!editingUrl)
syncLabel = false;
@@ -159,12 +162,14 @@ public class PullRequestRepositorySettingsPage extends
/**
* @see org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage#applyTo(org.eclipse.mylyn.tasks.core.TaskRepository)
*/
+ @Override
public void applyTo(TaskRepository repository) {
repository.setProperty(IRepositoryConstants.PROPERTY_CATEGORY,
TaskRepository.CATEGORY_REVIEW);
super.applyTo(repository);
}
+ @Override
public String getRepositoryUrl() {
return PullRequestConnector.appendPulls(super.getRepositoryUrl());
}

Back to the top