533119: First line of commit template ends with superfluous blank
The commit message template first line ends with a superfluous blank,
which is taken over as such when a commit message is created in egit.
Let's remove it from the template default value.
Also fix an off-by-one error in the commit template parsing. With the
new fixed template, it would always lead to removing the trailing curly
brace, and the substring method is already excluding the end index by
itself.
Change-Id: If0f138b10dafe1d0b3bd09c30c3bc10eec5eeb65
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Bug:533119
diff --git a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CopyCommitMessageHandlerTest.java b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CopyCommitMessageHandlerTest.java
index 270cd8f..c27cfe3 100644
--- a/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CopyCommitMessageHandlerTest.java
+++ b/org.eclipse.mylyn.team.tests/src/org/eclipse/mylyn/team/tests/CopyCommitMessageHandlerTest.java
@@ -65,7 +65,7 @@
addAndSelectTask();
executeCommand();
- assertEquals("1: My Task \n\nTask-Url: http://url", getClipboardContents());
+ assertEquals("1: My Task\n\nTask-Url: http://url", getClipboardContents());
}
private void addAndSelectTask() throws Exception {
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java
index 9c37631..a420bfb 100644
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java
+++ b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/FocusedTeamUiPlugin.java
@@ -50,7 +50,7 @@
public static final String COMMIT_TEMPLATE = "org.eclipse.mylyn.team.commit.template"; //$NON-NLS-1$
- public static final String DEFAULT_COMMIT_TEMPLATE = "${task.key}: ${task.description} \n\nTask-Url: ${task.url}"; //$NON-NLS-1$
+ public static final String DEFAULT_COMMIT_TEMPLATE = "${task.key}: ${task.description}\n\nTask-Url: ${task.url}"; //$NON-NLS-1$
public static class FocusedTeamUiStartup implements IStartup {
diff --git a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
index ed346e1..924669a 100644
--- a/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
+++ b/org.eclipse.mylyn.team.ui/src/org/eclipse/mylyn/internal/team/ui/templates/CommitTemplateManager.java
@@ -62,7 +62,7 @@
int templateNewline = template.indexOf('\n');
String templateFirstLineIndex = template;
if (templateNewline != -1) {
- templateFirstLineIndex = template.substring(0, templateNewline - 1);
+ templateFirstLineIndex = template.substring(0, templateNewline);
}
String regex = getTaskIdRegEx(templateFirstLineIndex);
