397620: [editor] Improve ordering of sectionsrefs/changes/08/9508/2

Change-Id: I10a7cbb2f09575a3c619923d90aab76ae2fed96d
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=397620

1 files changed, 16 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java
index 4c34170..c93fa4c 100644
--- a/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java
+++ b/org.eclipse.mylyn.gerrit.ui/src/org/eclipse/mylyn/internal/gerrit/ui/editor/GerritTaskEditorPage.java
@@ -60,6 +60,8 @@ public class GerritTaskEditorPage extends AbstractTaskEditorPage {
 	@Override
 	protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
 		Set<TaskEditorPartDescriptor> descriptors = super.createPartDescriptors();
+		TaskEditorPartDescriptor commentsDescriptor = null;
+		TaskEditorPartDescriptor newCommentsDescriptor = null;
 		for (Iterator<TaskEditorPartDescriptor> it = descriptors.iterator(); it.hasNext();) {
 			TaskEditorPartDescriptor descriptor = it.next();
 			if (PATH_ACTIONS.equals(descriptor.getPath())) {
@@ -68,6 +70,14 @@ public class GerritTaskEditorPage extends AbstractTaskEditorPage {
 			if (PATH_PEOPLE.equals(descriptor.getPath())) {
 				it.remove();
 			}
+			if (ID_PART_COMMENTS.equals(descriptor.getId())) {
+				it.remove();
+				commentsDescriptor = descriptor;
+			}
+			if (ID_PART_NEW_COMMENT.equals(descriptor.getId())) {
+				it.remove();
+				newCommentsDescriptor = descriptor;
+			}
 		}
 		descriptors.add(new TaskEditorPartDescriptor(ReviewSection.class.getName()) {
 			@Override
@@ -81,6 +91,12 @@ public class GerritTaskEditorPage extends AbstractTaskEditorPage {
 				return new PatchSetSection();
 			}
 		});
+		if (commentsDescriptor != null) {
+			descriptors.add(commentsDescriptor);
+		}
+		if (newCommentsDescriptor != null) {
+			descriptors.add(newCommentsDescriptor);
+		}
 		return descriptors;
 	}