NEW - bug 174205: "View past activity" link causes NullPointerException

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

1 files changed, 22 insertions, 18 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
index f3ff0946b..e4af10a98 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
@@ -283,19 +283,21 @@ public class TaskEditor extends FormEditor {
 		return;
 	}
 
-//	@Override
-//	public void setFocus() {
-//		if (this.getActivePage() > -1 && this.getActivePage() != browserPageIndex) {
-//			IFormPage page = this.getPages()[this.getActivePage()];
-//			if (page != null) {
-//				page.setFocus();
-//			}
-//		} else if(this.getActivePage() == browserPageIndex && webBrowser != null) {
-//			webBrowser.setFocus();
-//		}
-//	}
-
-	public void setFocusOfActivePage() { 
+	// @Override
+	// public void setFocus() {
+	// if (this.getActivePage() > -1 && this.getActivePage() !=
+	// browserPageIndex) {
+	// IFormPage page = this.getPages()[this.getActivePage()];
+	// if (page != null) {
+	// page.setFocus();
+	// }
+	// } else if(this.getActivePage() == browserPageIndex && webBrowser != null)
+	// {
+	// webBrowser.setFocus();
+	// }
+	// }
+
+	public void setFocusOfActivePage() {
 		if (this.getActivePage() > -1 && this.getActivePage() != browserPageIndex) {
 			IFormPage page = this.getPages()[this.getActivePage()];
 			if (page != null) {
@@ -305,7 +307,7 @@ public class TaskEditor extends FormEditor {
 			webBrowser.setFocus();
 		}
 	}
-	
+
 	public Browser getWebBrowser() {
 		return webBrowser;
 	}
@@ -315,8 +317,10 @@ public class TaskEditor extends FormEditor {
 	}
 
 	public void displayInBrowser(String url) {
-		webBrowser.setUrl(url);
-		revealBrowser();
+		if (webBrowser != null) {
+			webBrowser.setUrl(url);
+			revealBrowser();
+		}
 	}
 
 	@Override
@@ -449,11 +453,11 @@ public class TaskEditor extends FormEditor {
 	 * Update the title of the editor
 	 */
 	public void updateTitle(String name) {
-		//setContentDescription(name);
+		// setContentDescription(name);
 		setPartName(name);
 		setTitleToolTip(name);
 	}
-	
+
 	public ISelection getSelection() {
 		if (getSite() != null && getSite().getSelectionProvider() != null) {
 			return getSite().getSelectionProvider().getSelection();