{"thread":{"id":"17915","subject":"[PATCH JGIT] In the commit dialog, deal with Signed-off-by not on the last line","startedAt":"2009-02-20T08:09:53Z","lastAt":"2009-02-20T08:09:53Z","messageCount":1,"participants":["Yann Simon"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"105575","messageId":"499E6551.8080707@gmail.com","threadId":"17915","inReplyTo":null,"subject":"[PATCH JGIT] In the commit dialog, deal with Signed-off-by not on the last line","fromName":"Yann Simon","fromEmail":"yann.simon.fr@gmail.com","sentAt":"2009-02-20T08:09:53Z","receivedAt":"2009-02-20T08:09:53Z","isPatch":true,"sender":{"key":"yann.simon.fr@gmail.com","avatar":"https://gravatar.com/avatar/2d926895d27ac988c5c8e591887e5a6a4c7036390403c74fce92519119b887a0?d=mp&s=160"},"body":"The previous implementation made the assumption that\nthe Signed-off-by is always on the last line.\n\nCorrect this assumption and deal with Signed-off-by everywhere in\nthe commit message.\n\nSigned-off-by: Yann Simon <yann.simon.fr@gmail.com>\n---\nI found the problem with whitespace corruptions.\nyann\n\n .../egit/ui/internal/dialogs/CommitDialog.java     |   65 ++++++++++++--------\n 1 files changed, 40 insertions(+), 25 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\nindex bbe7193..403d69d 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/dialogs/CommitDialog.java\n@@ -179,14 +179,16 @@ public void keyPressed(KeyEvent arg0) {\n \t\tif (committer != null)\n \t\t\tcommitterText.setText(committer);\n \t\tcommitterText.addModifyListener(new ModifyListener() {\n+\t\t\tString oldCommitter = committerText.getText();\n \t\t\tpublic void modifyText(ModifyEvent e) {\n \t\t\t\tif (signedOffButton.getSelection()) {\n \t\t\t\t\t// the commit message is signed\n \t\t\t\t\t// the signature must be updated\n-\t\t\t\t\tString oldCommitText = commitText.getText();\n-\t\t\t\t\toldCommitText = removeLastLine(oldCommitText);\n-\t\t\t\t\toldCommitText = signOff(oldCommitText);\n-\t\t\t\t\tcommitText.setText(oldCommitText);\n+\t\t\t\t\tString neuCommitter = committerText.getText();\n+\t\t\t\t\tString oldSignOff = getSignedOff(oldCommitter);\n+\t\t\t\t\tString neuSignOff = getSignedOff(neuCommitter);\n+\t\t\t\t\tcommitText.setText(replaceSignOff(commitText.getText(), oldSignOff, neuSignOff));\n+\t\t\t\t\toldCommitter = neuCommitter;\n \t\t\t\t}\n \t\t\t}\n \t\t});\n@@ -230,12 +232,16 @@ public void widgetDefaultSelected(SelectionEvent arg0) {\n \n \t\tsignedOffButton.addSelectionListener(new SelectionListener() {\n \t\t\tpublic void widgetSelected(SelectionEvent arg0) {\n+\t\t\t\tString curText = commitText.getText();\n \t\t\t\tif (signedOffButton.getSelection()) {\n \t\t\t\t\t// add signed off line\n-\t\t\t\t\tcommitText.setText(signOff(commitText.getText()));\n+\t\t\t\t\tcommitText.setText(signOff(curText));\n \t\t\t\t} else {\n \t\t\t\t\t// remove signed off line\n-\t\t\t\t\tcommitText.setText(removeLastLine(commitText.getText()));\n+\t\t\t\t\tcurText = replaceSignOff(curText, getSignedOff(), \"\");\n+\t\t\t\t\tif (curText.endsWith(Text.DELIMITER + Text.DELIMITER))\n+\t\t\t\t\t\tcurText = curText.substring(0, curText.length() - Text.DELIMITER.length());\n+\t\t\t\t\tcommitText.setText(curText);\n \t\t\t\t}\n \t\t\t}\n \n@@ -279,11 +285,19 @@ public void modifyText(ModifyEvent e) {\n \t}\n \n \tprivate void updateSignedOffButton() {\n-\t\tsignedOffButton.setSelection(getLastLine(commitText.getText()).equals(getSignedOff()));\n+\t\tString curText = commitText.getText();\n+\t\tif (!curText.endsWith(Text.DELIMITER))\n+\t\t\tcurText += Text.DELIMITER;\n+\n+\t\tsignedOffButton.setSelection(curText.indexOf(getSignedOff() + Text.DELIMITER) != -1);\n \t}\n \n \tprivate String getSignedOff() {\n-\t\treturn Constants.SIGNED_OFF_BY_TAG + committerText.getText();\n+\t\treturn getSignedOff(committerText.getText());\n+\t}\n+\n+\tprivate String getSignedOff(String signer) {\n+\t\treturn Constants.SIGNED_OFF_BY_TAG + signer;\n \t}\n \n \tprivate String signOff(String input) {\n@@ -299,32 +313,33 @@ private String signOff(String input) {\n \t}\n \n \tprivate String getLastLine(String input) {\n-\t\tString output = removeLastLineBreak(input);\n+\t\tString output = input;\n \t\tint breakLength = Text.DELIMITER.length();\n \n-\t\t// get the last line\n+\t\t// remove last line break if exist\n \t\tint lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER);\n+\t\tif (lastIndexOfLineBreak != -1 && lastIndexOfLineBreak == output.length() - breakLength)\n+\t\t\toutput = output.substring(0, output.length() - breakLength);\n+\n+\t\t// get the last line\n+\t\tlastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER);\n \t\treturn lastIndexOfLineBreak == -1 ? output : output.substring(lastIndexOfLineBreak + breakLength, output.length());\n \t}\n \n-\tprivate String removeLastLine(String input) {\n-\t\tString output = removeLastLineBreak(input);\n+\tprivate String replaceSignOff(String input, String oldSignOff, String newSignOff) {\n+\t\tassert input != null;\n+\t\tassert oldSignOff != null;\n+\t\tassert newSignOff != null;\n \n-\t\t// remove the last line if possible\n-\t\tint lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER);\n-\t\treturn lastIndexOfLineBreak == -1 ? \"\" : output.substring(0, lastIndexOfLineBreak); //$NON-NLS-1$\n-\t}\n-\n-\tprivate String removeLastLineBreak(String input) {\n-\t\tString output = input;\n-\t\tint breakLength = Text.DELIMITER.length();\n+\t\tString curText = input;\n+\t\tif (!curText.endsWith(Text.DELIMITER))\n+\t\t\tcurText += Text.DELIMITER;\n \n-\t\t// remove last line break if exist\n-\t\tint lastIndexOfLineBreak = output.lastIndexOf(Text.DELIMITER);\n-\t\tif (lastIndexOfLineBreak != -1 && lastIndexOfLineBreak == output.length() - breakLength)\n-\t\t\toutput = output.substring(0, output.length() - breakLength);\n+\t\tint indexOfSignOff = curText.indexOf(oldSignOff + Text.DELIMITER);\n+\t\tif (indexOfSignOff == -1)\n+\t\t\treturn input;\n \n-\t\treturn output;\n+\t\treturn input.substring(0, indexOfSignOff) + newSignOff + input.substring(indexOfSignOff + oldSignOff.length(), input.length());\n \t}\n \n \tprivate Menu getContextMenu() {\n-- \n1.6.1.2\n"}]}