From fa35f07c6a5fa8ba6713c3236250b9cc12a4bc25 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Mon, 9 Dec 2013 20:55:32 +0100 Subject: [PATCH] Fixes from linquize --- .../Project/Commands/FormsCommand.cs | 4 +- .../Project/Commands/ViewCommands.cs | 43 +++++-------------- .../ReportDesignerDisplayBinding.cs | 7 ++- .../ReportExplorer/ReportExplorerPad.cs | 5 ++- 4 files changed, 20 insertions(+), 39 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/FormsCommand.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/FormsCommand.cs index aa977a3561..c929485a48 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/FormsCommand.cs +++ b/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(); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs index a414cfbd47..175ce5fc34 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs @@ -19,48 +19,25 @@ namespace ICSharpCode.Reports.Addin.Commands /// /// Description of StartView /// - public class StartViewCommand : AbstractMenuCommand + public class CreateDesignViewCommand : AbstractMenuCommand { + readonly OpenedFile openedFile; - public override void Run() - { - throw new NotImplementedException("StartViewCommand-Run"); -// SD.Workbench.ShowView(SetupDesigner()); + public CreateDesignViewCommand (OpenedFile openedFile) { + if (openedFile == null) + throw new ArgumentNullException("openedFile"); + this.openedFile = openedFile; } - /* - public static ReportDesignerView SetupDesigner () - { - 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 override void Run(){ + var generator = new ReportDesignerGenerator(); + DesignerView = new ReportDesignerView(openedFile, generator); } + public ReportDesignerView DesignerView {get; private set;} } - public class CollectParametersCommand :AbstractCommand { ReportSettings reportSettings; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerDisplayBinding.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerDisplayBinding.cs index 47b75e32d6..ab29a7c120 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerDisplayBinding.cs +++ b/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); - return view; + var viewCmd = new CreateDesignViewCommand(file); + viewCmd.Run(); + return viewCmd.DesignerView; } + public bool IsPreferredBindingForFile(ICSharpCode.Core.FileName fileName) { return true; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ReportExplorerPad.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ReportExplorerPad.cs index 3ebf7f5298..6e00d44855 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ReportExplorerPad.cs +++ b/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; - WorkbenchSingleton.Workbench.ViewClosed += ActiveViewClosed; + SD.Workbench.ActiveViewContentChanged += ActiveViewContentChanged; + SD.Workbench.ViewClosed += ActiveViewClosed; this.explorerTree = new ExplorerTree(); this.explorerTree.MouseDown += new MouseEventHandler(ReportExplorer_MouseDown); this.explorerTree.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(ReportExplorerPad_PropertyChanged);