diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-05-13 11:55:31 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-05-13 11:55:31 +0200 |
| commit | e2d18cc92da395c55bb526ef008a5e7cb11e89fb (patch) | |
| tree | 818418051a8a6c270d330e3ea78d5691467c8bd0 /sonar-core | |
| parent | b8f7dae2cd21c8a8cf1cf629161402b136c077c9 (diff) | |
| download | sonarqube-e2d18cc92da395c55bb526ef008a5e7cb11e89fb.tar.gz sonarqube-e2d18cc92da395c55bb526ef008a5e7cb11e89fb.zip | |
SONAR-4321 improve rendering of dates and html text
Diffstat (limited to 'sonar-core')
3 files changed, 11 insertions, 11 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java index 1a5e1f29b99..466800a26ee 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueComment.java @@ -33,16 +33,16 @@ public class DefaultIssueComment implements Serializable, IssueComment { private String userLogin; private Date createdAt, updatedAt; private String key; - private String text; + private String markdownText; private boolean isNew; @Override - public String text() { - return text; + public String markdownText() { + return markdownText; } - public DefaultIssueComment setText(String s) { - this.text = s; + public DefaultIssueComment setMarkdownText(String s) { + this.markdownText = s; return this; } @@ -108,13 +108,13 @@ public class DefaultIssueComment implements Serializable, IssueComment { return this; } - public static DefaultIssueComment create(String issueKey, @Nullable String login, String text) { + public static DefaultIssueComment create(String issueKey, @Nullable String login, String markdownText) { DefaultIssueComment comment = new DefaultIssueComment(); comment.setIssueKey(issueKey); comment.setKey(UUID.randomUUID().toString()); Date now = new Date(); comment.setUserLogin(login); - comment.setText(text); + comment.setMarkdownText(markdownText); comment.setCreatedAt(now).setUpdatedAt(now); comment.setNew(true); return comment; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java b/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java index e81451ace21..49cde1f22c1 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java @@ -34,7 +34,7 @@ class ChangeDtoConverter { IssueChangeDto dto = newDto(comment.issueKey()); dto.setKey(comment.key()); dto.setChangeType(IssueChangeDto.TYPE_COMMENT); - dto.setChangeData(comment.text()); + dto.setChangeData(comment.markdownText()); dto.setUserLogin(comment.userLogin()); return dto; } @@ -60,7 +60,7 @@ class ChangeDtoConverter { public static DefaultIssueComment dtoToComment(IssueChangeDto dto) { return new DefaultIssueComment() - .setText(dto.getChangeData()) + .setMarkdownText(dto.getChangeData()) .setKey(dto.getKey()) .setCreatedAt(dto.getCreatedAt()) .setUpdatedAt(dto.getUpdatedAt()) diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java index 3d3c641ba8f..d20e13dbdd3 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java @@ -53,13 +53,13 @@ public class IssueChangeDaoTest extends AbstractDaoTestCase { // chronological order DefaultIssueComment first = comments.get(0); - assertThat(first.text()).isEqualTo("old comment"); + assertThat(first.markdownText()).isEqualTo("old comment"); DefaultIssueComment second = comments.get(1); assertThat(second.userLogin()).isEqualTo("arthur"); assertThat(second.key()).isEqualTo("FGHIJ"); - assertThat(second.text()).isEqualTo("recent comment"); + assertThat(second.markdownText()).isEqualTo("recent comment"); } @Test |