Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick-Jeffrey Pollo Guilbert2016-04-29 11:33:18 -0400
committerMatthias Sohn2016-05-15 17:40:31 -0400
commitbcfe738d435abaa0621d44efb431d578de1d6761 (patch)
treeb6c66319107867dbbfb1069b7945a6a03d0a24e2
parent86ba60ac56d8a832a7ab472c006b1d84b6cad02c (diff)
downloadegit-github-bcfe738d435abaa0621d44efb431d578de1d6761.tar.gz
egit-github-bcfe738d435abaa0621d44efb431d578de1d6761.tar.xz
egit-github-bcfe738d435abaa0621d44efb431d578de1d6761.zip
Fix auto-filled issue task URL
Bug: 486345 Change-Id: I409878995f8cf4f55bcf823d5b898c27e52c0cb5 Signed-off-by: Patrick-Jeffrey Pollo Guilbert <patrick.pollo.guilbert@ericsson.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.mylyn.github.core/src/org/eclipse/mylyn/internal/github/core/issue/IssueConnector.java6
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueConnectorUi.java2
2 files changed, 4 insertions, 4 deletions
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 696846a8..f93a3604 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
@@ -377,7 +377,7 @@ public class IssueConnector extends RepositoryConnector {
public String getRepositoryUrlFromTaskUrl(String taskFullUrl) {
if (taskFullUrl != null) {
Matcher matcher = Pattern.compile(
- "(http://.+?)/issues/issue/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
+ "(http://.+?)/issues/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
if (matcher.matches())
return matcher.group(1);
}
@@ -388,7 +388,7 @@ public class IssueConnector extends RepositoryConnector {
public String getTaskIdFromTaskUrl(String taskFullUrl) {
if (taskFullUrl != null) {
Matcher matcher = Pattern
- .compile(".+?/issues/issue/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
+ .compile(".+?/issues/([^/]+)").matcher(taskFullUrl); //$NON-NLS-1$
if (matcher.matches())
return matcher.group(1);
}
@@ -397,7 +397,7 @@ public class IssueConnector extends RepositoryConnector {
@Override
public String getTaskUrl(String repositoryUrl, String taskId) {
- return repositoryUrl + "/issues/issue/" + taskId; //$NON-NLS-1$
+ return repositoryUrl + "/issues/" + taskId; //$NON-NLS-1$
}
@Override
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 5785df3c..d8c27613 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
@@ -160,7 +160,7 @@ public class IssueConnectorUi extends AbstractRepositoryConnectorUi {
} else if (user != null && project != null) {
Region region = createRegion(textOffset, matcher);
String url = GitHub.createGitHubUrl(user, project)
- + "/issues/issue/" + taskId;
+ + "/issues/" + taskId;
hyperlinks.add(new URLHyperlink(region, url));
}
}

Back to the top