diff options
| author | Tomasz Zarna | 2014-05-22 12:36:13 +0000 |
|---|---|---|
| committer | Miles Parker | 2014-05-28 17:46:49 +0000 |
| commit | 070c052166618828f92a015ca845e7165690b7db (patch) | |
| tree | b5e3aadd5465103290d8c07112a77e5e73691e98 /org.eclipse.mylyn.reviews.ui/src | |
| parent | f9ef07f79ec5269dfcbc7ea6658cdca0f4fe2f67 (diff) | |
| download | org.eclipse.mylyn.reviews-070c052166618828f92a015ca845e7165690b7db.tar.gz org.eclipse.mylyn.reviews-070c052166618828f92a015ca845e7165690b7db.tar.xz org.eclipse.mylyn.reviews-070c052166618828f92a015ca845e7165690b7db.zip | |
435438: NPE when hovering the person icon for a new comment
Change-Id: I43f564f3a81ccadfac265c7893d673b06f48789a
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=435438
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
Diffstat (limited to 'org.eclipse.mylyn.reviews.ui/src')
3 files changed, 7 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java index 02b53a69e..8cce5cb84 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/AbstractCommentPart.java @@ -26,6 +26,7 @@ import org.eclipse.mylyn.internal.reviews.ui.IReviewAction; import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextEditor; import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorExtensions; import org.eclipse.mylyn.reviews.core.model.IComment; +import org.eclipse.mylyn.reviews.core.model.IUser; import org.eclipse.mylyn.reviews.ui.ReviewBehavior; import org.eclipse.mylyn.reviews.ui.SizeCachingComposite; import org.eclipse.mylyn.tasks.core.ITask; @@ -69,8 +70,9 @@ public abstract class AbstractCommentPart<V extends ExpandablePart<IComment, V>> @Override protected String getSectionHeaderText() { + IUser author = comment.getAuthor(); return NLS.bind(Messages.AbstractCommentPart_Section_header, // - comment.getAuthor().getDisplayName(), // + author != null ? author.getDisplayName() : Messages.AbstractCommentPart_No_author, // DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT).format(comment.getCreationDate()) // ); } diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/Messages.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/Messages.java index e65db5e9e..523d4477c 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/Messages.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/Messages.java @@ -18,7 +18,10 @@ public class Messages extends NLS { public static String AbstractCommentPart_Draft; + public static String AbstractCommentPart_No_author; + public static String AbstractCommentPart_Section_header; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/messages.properties b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/messages.properties index eae3301de..1a5d18c43 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/messages.properties +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/editors/parts/messages.properties @@ -9,4 +9,5 @@ # Tasktop Technologies - initial API and implementation ############################################################################### AbstractCommentPart_Draft=DRAFT +AbstractCommentPart_No_author=(no author) AbstractCommentPart_Section_header={0} {1} |