Fix the feature to edit a comment

junichi11 · junichi11 · commit 47d76f6d56aa · 2015-01-17T14:51:30.000+09:00
diff --git a/src/main/java/com/junichi11/netbeans/modules/github/issues/issue/GitHubIssue.java b/src/main/java/com/junichi11/netbeans/modules/github/issues/issue/GitHubIssue.java
@@ -64,6 +64,8 @@
 import org.netbeans.modules.bugtracking.spi.IssueProvider;
 import org.netbeans.modules.bugtracking.spi.IssueStatusProvider;
 import org.openide.util.NbBundle;
+import org.pegdown.Extensions;
+import org.pegdown.PegDownProcessor;
 
 /**
  *
@@ -246,6 +248,28 @@ public Issue editIssue(CreateIssueParams params) {
         return editIssue;
     }
 
+    public Comment editComment(Comment comment, String editedBody) {
+        if (editedBody != null) {
+            String originalBody = comment.getBody();
+            if (issue != null) {
+                comment.setBody(editedBody);
+                Comment editComment = GitHubIssueSupport.editComment(getRepository(), comment);
+                if (editComment != null) {
+                    PegDownProcessor processor = new PegDownProcessor(Extensions.FENCED_CODE_BLOCKS);
+                    String body = editComment.getBody();
+                    String bodyHtml = processor.markdownToHtml(body);
+                    comment.setBodyHtml(String.format("<html>%s</html>", bodyHtml)); // NOI18N
+                    comment.setBody(body);
+                    comment.setUpdatedAt(editComment.getUpdatedAt());
+                } else {
+                    comment.setBody(originalBody);
+                }
+                return editComment;
+            }
+        }
+        return null;
+    }
+
     public boolean isCreatedUser() {
         if (issue == null) {
             return false;
diff --git a/src/main/java/com/junichi11/netbeans/modules/github/issues/issue/GitHubIssueController.java b/src/main/java/com/junichi11/netbeans/modules/github/issues/issue/GitHubIssueController.java
@@ -65,8 +65,6 @@
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
-import org.pegdown.Extensions;
-import org.pegdown.PegDownProcessor;
 
 /**
  *
@@ -199,11 +197,11 @@ public void propertyChange(PropertyChangeEvent evt) {
     }
 
     @NbBundle.Messages({
-        "GitHubIssueController.edit.comment.title=Edit Comment"
+        "GitHubIssueController.edit.comment.title=Edit Comment",
+        "GitHubIssueController.edit.comment.fail=Can't edit this comment."
     })
     private void editComment() {
         final Comment comment = getPanel().getEditedComment();
-        final String originalBody = comment.getBody();
         final String editedBody = CommentTabbedPanel.showDialog(Bundle.GitHubIssueController_edit_comment_title(), comment.getBody());
         if (editedBody != null) {
             final GitHubIssue issue = getPanel().getIssue();
@@ -213,23 +211,18 @@ private void editComment() {
 
                     @Override
                     public void run() {
-                        comment.setBody(editedBody);
-                        Comment editComment = GitHubIssueSupport.editComment(issue.getRepository(), comment);
-                        if (editComment != null) {
-                            PegDownProcessor processor = new PegDownProcessor(Extensions.FENCED_CODE_BLOCKS);
-                            String body = editComment.getBody();
-                            String bodyHtml = processor.markdownToHtml(body);
-                            comment.setBodyHtml(String.format("<html>%s</html>", bodyHtml)); // NOI18N
-                            SwingUtilities.invokeLater(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    getPanel().loadComments();
-                                }
-                            });
-                        } else {
-                            comment.setBody(originalBody);
+                        Comment editedComment = issue.editComment(comment, editedBody);
+                        if (editedComment == null) {
+                            UiUtils.showErrorDialog(Bundle.GitHubIssueController_edit_comment_fail());
+                            return;
                         }
+                        SwingUtilities.invokeLater(new Runnable() {
+
+                            @Override
+                            public void run() {
+                                getPanel().loadComments();
+                            }
+                        });
                     }
                 });
             }
diff --git a/src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/GitHubIssuePanel.java b/src/main/java/com/junichi11/netbeans/modules/github/issues/issue/ui/GitHubIssuePanel.java
@@ -260,6 +260,7 @@ public void update() {
 
     public void loadComments() {
         commentsPanel.loadComments();
+        fireChange();
     }
 
     private void setAssigneeSelected(User assignee) {

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ public void update() {`
`260`	`260`
`261`	`261`	`public void loadComments() {`
`262`	`262`	`commentsPanel.loadComments();`
	`263`	`+ fireChange();`
`263`	`264`	`}`
`264`	`265`
`265`	`266`	`private void setAssigneeSelected(User assignee) {`