Fixed NullReferenceException in TaskListPad.IsInScope

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3598 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

@@ -156,7 +156,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		public void UpdateItems()
-		{		
+		{
 			this.taskView.BeginUpdate();
 			
 			this.taskView.ClearTasks();
@@ -182,22 +182,23 @@ namespace ICSharpCode.SharpDevelop.Gui
 			IClass current = GetCurrentClass();
 			IClass itemClass = GetCurrentClass(item);
 			
-			switch (this.selectedScopeIndex)
+			switch (this.selectedScopeIndex) {
-			{
 				case 0:
-					foreach (AbstractProject proj in ProjectService.OpenSolution.Projects)
+					if (ProjectService.OpenSolution != null) {
-						if (proj.FindFile(item.FileName) != null)
+						foreach (AbstractProject proj in ProjectService.OpenSolution.Projects) {
-						return true;
+							if (proj.FindFile(item.FileName) != null)
-					
+								return true;
+						}
+					}
 					return false;
 				case 1:
-					return ((WorkbenchSingleton.Workbench.ActiveViewContent != null) && (ProjectService.CurrentProject.FindFile(item.FileName) != null));
+					return ProjectService.CurrentProject != null && ProjectService.CurrentProject.FindFile(item.FileName) != null;
 				case 2:
-					return ((WorkbenchSingleton.Workbench.ActiveViewContent != null) && (WorkbenchSingleton.Workbench.ActiveViewContent.PrimaryFileName == item.FileName));
+					return WorkbenchSingleton.Workbench.ActiveViewContent != null && WorkbenchSingleton.Workbench.ActiveViewContent.PrimaryFileName == item.FileName;
 				case 3:
-					return ((current != null) && (itemClass != null) && (current.Namespace == itemClass.Namespace));
+					return current != null && itemClass != null && current.Namespace == itemClass.Namespace;
 				case 4:
-					return ((current != null) && (itemClass != null) && (current == itemClass));
+					return current != null && itemClass != null && current == itemClass;
 			}
 			
 			return true;
@@ -210,10 +211,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			
 			ParseInformation parseInfo = ParserService.GetParseInformation(WorkbenchSingleton.Workbench.ActiveViewContent.PrimaryFileName);
 			if (parseInfo != null) {
-				if (WorkbenchSingleton.Workbench.ActiveViewContent.Control is ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.SharpDevelopTextAreaControl)
+				IPositionable positionable = WorkbenchSingleton.Workbench.ActiveViewContent as IPositionable;
-				{SharpDevelopTextAreaControl ctrl = WorkbenchSingleton.Workbench.ActiveViewContent.Control
+				if (positionable != null) {
-						as SharpDevelopTextAreaControl;
+					IClass c = parseInfo.MostRecentCompilationUnit.GetInnermostClass(positionable.Line, positionable.Column);
-					IClass c = parseInfo.MostRecentCompilationUnit.GetInnermostClass(ctrl.ActiveTextAreaControl.Caret.Line, ctrl.ActiveTextAreaControl.Caret.Column);
 					if (c != null) return c;
 				}
 			}