Attachment 198759 Details for Bug 349771 – patch V1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch V1

patch349771V1.txt (text/plain), 4.81 KB, created by Frank Becker

on 2011-06-28 13:39:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2011-06-28 13:39:00 EDT

Size: 4.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorNewCommentPart.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorNewCommentPart.java,v
>retrieving revision 1.1
>diff -u -r1.1 BugzillaTaskEditorNewCommentPart.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorNewCommentPart.java	20 Jun 2011 19:28:59 -0000	1.1
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorNewCommentPart.java	28 Jun 2011 17:36:15 -0000
>@@ -64,11 +64,13 @@
> 	@Override
> 	public void initialize(AbstractTaskEditorPage taskEditorPage) {
> 		super.initialize(taskEditorPage);
>-		TaskAttribute isprivate = getAttribute().getParentAttribute().getAttribute("comment_is_private"); //$NON-NLS-1$
>-		if (isprivate == null) {
>-			isprivate = getAttribute().getParentAttribute().createAttribute("comment_is_private"); //$NON-NLS-1$
>+		if (getAttribute() != null) {
>+			TaskAttribute isprivate = getAttribute().getParentAttribute().getAttribute("comment_is_private"); //$NON-NLS-1$
>+			if (isprivate == null) {
>+				isprivate = getAttribute().getParentAttribute().createAttribute("comment_is_private"); //$NON-NLS-1$
>+			}
>+			isprivate.setValue("0"); //$NON-NLS-1$
> 		}
>-		isprivate.setValue("0"); //$NON-NLS-1$
> 	}
> 
> }
>#P org.eclipse.mylyn.sandbox.ui
>Index: src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleBugzillaTaskEditorPage.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.incubator/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleBugzillaTaskEditorPage.java,v
>retrieving revision 1.13
>diff -u -r1.13 ExtensibleBugzillaTaskEditorPage.java
>--- src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleBugzillaTaskEditorPage.java	24 Jul 2009 12:07:51 -0000	1.13
>+++ src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleBugzillaTaskEditorPage.java	28 Jun 2011 17:36:16 -0000
>@@ -132,18 +132,22 @@
> 	@Override
> 	protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
> 		Set<TaskEditorPartDescriptor> descriptors = super.createPartDescriptors();
>+		boolean hasPartNewComment = false;
> 		for (TaskEditorPartDescriptor taskEditorPartDescriptor : descriptors) {
> 			if (taskEditorPartDescriptor.getId().equals(ID_PART_NEW_COMMENT)) {
> 				descriptors.remove(taskEditorPartDescriptor);
>+				hasPartNewComment = true;
> 				break;
> 			}
> 		}
>-		descriptors.add(new TaskEditorPartDescriptor(ID_PART_NEW_COMMENT) {
>-			@Override
>-			public AbstractTaskEditorPart createPart() {
>-				return new ExtensibleTaskEditorNewCommentPart();
>-			}
>-		}.setPath(PATH_COMMENTS));
>+		if (hasPartNewComment) {
>+			descriptors.add(new TaskEditorPartDescriptor(ID_PART_NEW_COMMENT) {
>+				@Override
>+				public AbstractTaskEditorPart createPart() {
>+					return new ExtensibleTaskEditorNewCommentPart();
>+				}
>+			}.setPath(PATH_COMMENTS));
>+		}
> 		return descriptors;
> 	}
> 
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java,v
>retrieving revision 1.175
>diff -u -r1.175 AbstractTaskEditorPage.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java	9 Jun 2011 18:57:04 -0000	1.175
>+++ src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java	28 Jun 2011 17:36:17 -0000
>@@ -527,9 +527,11 @@
> 
> 	public void appendTextToNewComment(String text) {
> 		AbstractTaskEditorPart newCommentPart = getPart(ID_PART_NEW_COMMENT);
>-		if (newCommentPart instanceof TaskEditorRichTextPart) {
>-			((TaskEditorRichTextPart) newCommentPart).appendText(text);
>-			newCommentPart.setFocus();
>+		if (newCommentPart != null) {
>+			if (newCommentPart instanceof TaskEditorRichTextPart) {
>+				((TaskEditorRichTextPart) newCommentPart).appendText(text);
>+				newCommentPart.setFocus();
>+			}
> 		}
> 	}
> 
>@@ -778,13 +780,14 @@
> 					return new TaskEditorCommentPart();
> 				}
> 			}.setPath(PATH_COMMENTS));
>+
>+			descriptors.add(new TaskEditorPartDescriptor(ID_PART_NEW_COMMENT) {
>+				@Override
>+				public AbstractTaskEditorPart createPart() {
>+					return new TaskEditorNewCommentPart();
>+				}
>+			}.setPath(PATH_COMMENTS));
> 		}
>-		descriptors.add(new TaskEditorPartDescriptor(ID_PART_NEW_COMMENT) {
>-			@Override
>-			public AbstractTaskEditorPart createPart() {
>-				return new TaskEditorNewCommentPart();
>-			}
>-		}.setPath(PATH_COMMENTS));
> 
> 		if (needsPrivateSection() || taskData.isNew()) {
> 			descriptors.add(new TaskEditorPartDescriptor(ID_PART_PLANNING) {

Actions: View | Diff

Attachments on bug 349771: 198759 | 198760 | 198771 | 198772 | 198942 | 198943 | 200529 | 200530 | 203832 | 204470