NEW - bug 170683: Move Show Bug Activity into the Actions section

https://bugs.eclipse.org/bugs/show_bug.cgi?id=170683

2 files changed, 35 insertions, 26 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
index cc3cab5df..88b2409d1 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
@@ -246,18 +246,21 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
 
 		addVoting(composite);
 
-//		label = toolkit.createLabel(composite, "");
-//		Hyperlink viewActivity = toolkit.createHyperlink(composite, "Show Bug Activity", SWT.NONE);
-//		viewActivity.addHyperlinkListener(new HyperlinkAdapter() {
-//			@Override
-//			public void linkActivated(HyperlinkEvent e) {
-//				if (BugzillaTaskEditor.this.getEditor() instanceof TaskEditor) {
-//					TaskEditor mylarTaskEditor = (TaskEditor) BugzillaTaskEditor.this.getEditor();
-//					mylarTaskEditor.displayInBrowser(repository.getUrl() + IBugzillaConstants.URL_BUG_ACTIVITY
-//							+ taskData.getId());
-//				}
-//			}
-//		});
+		// label = toolkit.createLabel(composite, "");
+		// Hyperlink viewActivity = toolkit.createHyperlink(composite, "Show Bug
+		// Activity", SWT.NONE);
+		// viewActivity.addHyperlinkListener(new HyperlinkAdapter() {
+		// @Override
+		// public void linkActivated(HyperlinkEvent e) {
+		// if (BugzillaTaskEditor.this.getEditor() instanceof TaskEditor) {
+		// TaskEditor mylarTaskEditor = (TaskEditor)
+		// BugzillaTaskEditor.this.getEditor();
+		// mylarTaskEditor.displayInBrowser(repository.getUrl() +
+		// IBugzillaConstants.URL_BUG_ACTIVITY
+		// + taskData.getId());
+		// }
+		// }
+		// });
 
 		// If groups is available add roles
 		if (taskData.getAttribute(BugzillaReportElement.GROUP.getKeyString()) != null) {
@@ -901,20 +904,8 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
 		urlText.addListener(SWT.FocusIn, new GenericListener());
 	}
 
-	protected void addActionButtons(Composite buttonComposite) {
-		super.addActionButtons(buttonComposite);
-		Hyperlink hyperlink = toolkit.createHyperlink(buttonComposite, "Past activity", SWT.NONE);
-		hyperlink.addHyperlinkListener(new HyperlinkAdapter() {
-			@Override
-			public void linkActivated(HyperlinkEvent e) {
-				if (BugzillaTaskEditor.this.getEditor() instanceof TaskEditor) {
-					TaskEditor mylarTaskEditor = (TaskEditor) BugzillaTaskEditor.this.getEditor();
-					mylarTaskEditor.displayInBrowser(repository.getUrl() + IBugzillaConstants.URL_BUG_ACTIVITY
-							+ taskData.getId());
-				}
-			}
-		});
-
+	protected String getActivityUrl() {
+		return repository.getUrl() + IBugzillaConstants.URL_BUG_ACTIVITY + taskData.getId();
 	}
 	// protected void createDescriptionLayout(Composite composite) {
 	// // This is migration code from 0.6.1 -> 0.6.2
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
index 45a34268b..3961e48d6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
@@ -145,6 +145,7 @@ import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.events.IExpansionListener;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ImageHyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
@@ -1766,6 +1767,23 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 		if (task != null) {
 			addAttachContextButton(buttonComposite, task);
 		}
+
+		if (getActivityUrl() != null) {
+			Hyperlink hyperlink = toolkit.createHyperlink(buttonComposite, "Past activity", SWT.NONE);
+			hyperlink.addHyperlinkListener(new HyperlinkAdapter() {
+				@Override
+				public void linkActivated(HyperlinkEvent e) {
+					if (AbstractRepositoryTaskEditor.this.getEditor() instanceof TaskEditor) {
+						TaskEditor mylarTaskEditor = (TaskEditor) AbstractRepositoryTaskEditor.this.getEditor();
+						mylarTaskEditor.displayInBrowser(getActivityUrl());
+					}
+				}
+			});
+		}
+	}
+
+	protected String getActivityUrl() {
+		return null;
 	}
 
 	/**