Fixes from linquize <notifications@github.com>

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/FormsCommand.cs

@@ -67,7 +67,7 @@ namespace ICSharpCode.Reports.Addin.Commands
 		
 		public override void Run()
 		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
+			IWorkbenchWindow window = SD.Workbench.ActiveWorkbenchWindow;
 			if (window == null) {
 				return;
 			}
@@ -89,7 +89,7 @@ namespace ICSharpCode.Reports.Addin.Commands
 
 		public override void Run()
 		{
-			PadDescriptor padContent = WorkbenchSingleton.Workbench.GetPad(typeof(ICSharpCode.SharpDevelop.Gui.PropertyPad));
+			PadDescriptor padContent = SD.Workbench.GetPad(typeof(ICSharpCode.SharpDevelop.Gui.PropertyPad));
 			if (padContent != null) {
 				padContent.BringPadToFront();
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs

@@ -19,48 +19,25 @@ namespace ICSharpCode.Reports.Addin.Commands
 	/// <summary>
 	/// Description of StartView
 	/// </summary>
-	public class StartViewCommand : AbstractMenuCommand
+	public class CreateDesignViewCommand : AbstractMenuCommand
 	{
+		readonly OpenedFile openedFile;
 		
-		public override void Run()
+		public CreateDesignViewCommand (OpenedFile openedFile) {
-		{
+			if (openedFile == null)
-			throw new NotImplementedException("StartViewCommand-Run");
+				throw new ArgumentNullException("openedFile");
-//			SD.Workbench.ShowView(SetupDesigner());
+			this.openedFile = openedFile;
 		}
 		
-		/*
+		public override void Run(){
-		public static ReportDesignerView SetupDesigner ()
+			var generator = new ReportDesignerGenerator();
-		{
+			DesignerView =  new ReportDesignerView(openedFile, generator);
-			throw new NotImplementedException("SetupDesigner");
-			ReportModel model = ReportModel.Create();
-			
-			var reportStructure = new ReportStructure()
-			{
-				ReportLayout = GlobalEnums.ReportLayout.ListLayout;
-			}
-			IReportGenerator generator = new GeneratePlainReport(model,reportStructure);
-			generator.GenerateReport();
-			
-//			OpenedFile file = FileService.CreateUntitledOpenedFile(GlobalValues.PlainFileName,new byte[0]);
-//			file.SetData(generator.Generated.ToArray());
-//			return SetupDesigner(file);
-			return SetupDesigner(null);
-		}
-		*/
-		
-		public static ReportDesignerView SetupDesigner (OpenedFile file)
-		{
-			if (file == null) {
-				throw new ArgumentNullException("file");
-			}
-			IDesignerGenerator generator = new ReportDesignerGenerator();
-			return new ReportDesignerView(file, generator);
 		}
 		
+		public ReportDesignerView DesignerView {get; private set;}
 	}
 	
 	
-	
 	public class CollectParametersCommand :AbstractCommand
 	{
 		ReportSettings reportSettings;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerDisplayBinding.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using ICSharpCode.Reports.Addin.Commands;
 using ICSharpCode.Reports.Addin.ReportWizard;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
@@ -32,10 +33,12 @@ namespace ICSharpCode.Reports.Addin
 				}
 				file.SetData(cmd.GeneratedReport.ToArray());
 			}
-			ReportDesignerView view = ICSharpCode.Reports.Addin.Commands.StartViewCommand.SetupDesigner(file);
+			var viewCmd = new CreateDesignViewCommand(file);
-			return view;
+			viewCmd.Run();
+			return viewCmd.DesignerView;
 		}
 
+		
 		public bool IsPreferredBindingForFile(ICSharpCode.Core.FileName fileName)
 		{
 			return true;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ReportExplorerPad.cs

@@ -8,6 +8,7 @@ using System.Windows.Forms;
 
 using ICSharpCode.Core.WinForms;
 using ICSharpCode.Reports.Core;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Workbench;
 
@@ -29,8 +30,8 @@ namespace ICSharpCode.Reports.Addin
 		
 		public ReportExplorerPad():base()
 		{
-			WorkbenchSingleton.Workbench.ActiveViewContentChanged += ActiveViewContentChanged;
+			SD.Workbench.ActiveViewContentChanged += ActiveViewContentChanged;
-			WorkbenchSingleton.Workbench.ViewClosed += ActiveViewClosed;
+			SD.Workbench.ViewClosed += ActiveViewClosed;
 			this.explorerTree = new ExplorerTree();
 			this.explorerTree.MouseDown += new MouseEventHandler(ReportExplorer_MouseDown);
 			this.explorerTree.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(ReportExplorerPad_PropertyChanged);