From f8488b61a75d9669f017c4fcbae08d6d57867227 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 30 May 2013 12:03:17 +0200 Subject: [PATCH] Fix some compiler warnings. --- .../AvalonEdit.AddIn/Src/EnhancedScrollBar.cs | 29 +++++++++++-------- .../Project/Src/Commands/FormsCommands.cs | 10 +++---- .../Project/Src/Commands/SideBarCommands.cs | 3 +- .../Project/Src/Gui/AddComponentsDialog.cs | 2 +- .../Project/Src/Services/UIService.cs | 2 +- .../Project/Parser/ProjectContentContainer.cs | 8 ++--- .../Src/Project/Behaviors/ResXConverter.cs | 2 +- .../Items/ProjectReferenceProjectItem.cs | 2 +- .../ProjectWithServiceReferencesTests.cs | 6 ++-- 9 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/EnhancedScrollBar.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/EnhancedScrollBar.cs index 061e50eaaa..db89b72792 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/EnhancedScrollBar.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/EnhancedScrollBar.cs @@ -207,10 +207,26 @@ namespace ICSharpCode.AvalonEdit.AddIn #region TrackAdorner sealed class TrackAdorner : Adorner { + static readonly StreamGeometry triangleGeometry = CreateTriangleGeometry(); + + static StreamGeometry CreateTriangleGeometry() + { + var triangleGeometry = new StreamGeometry(); + using (var ctx = triangleGeometry.Open()) { + const double triangleSize = 6.5; + const double right = (triangleSize * 0.866) / 2; + const double left = -right; + ctx.BeginFigure(new Point(left, triangleSize / 2), true, true); + ctx.LineTo(new Point(left, -triangleSize / 2), true, false); + ctx.LineTo(new Point(right, 0), true, false); + } + triangleGeometry.Freeze(); + return triangleGeometry; + } + readonly AdornerLayer adornerLayer; readonly TextEditor editor; readonly TextMarkerService textMarkerService; - readonly StreamGeometry triangleGeometry; public TrackAdorner(EnhancedScrollBar enhanchedScrollBar, AdornerLayer adornerLayer, UIElement adornedElement) : base(adornedElement) @@ -222,17 +238,6 @@ namespace ICSharpCode.AvalonEdit.AddIn this.Cursor = Cursors.Hand; this.ToolTip = string.Empty; - triangleGeometry = new StreamGeometry(); - using (var ctx = triangleGeometry.Open()) { - const double triangleSize = 6.5; - const double right = (triangleSize * 0.866) / 2; - const double left = -right; - ctx.BeginFigure(new Point(left, triangleSize / 2), true, true); - ctx.LineTo(new Point(left, -triangleSize / 2), true, false); - ctx.LineTo(new Point(right, 0), true, false); - } - triangleGeometry.Freeze(); - adornerLayer.Add(this); textMarkerService.RedrawRequested += textMarkerService_RedrawRequested; } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs index 13910bb1ec..c2cad798be 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs @@ -64,7 +64,7 @@ namespace ICSharpCode.FormsDesigner.Commands FormsDesignerViewContent FormDesigner { get { - IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; + IWorkbenchWindow window = SD.Workbench.ActiveWorkbenchWindow; if (window == null) { return null; } @@ -74,7 +74,7 @@ namespace ICSharpCode.FormsDesigner.Commands public override void Run() { - IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; + IWorkbenchWindow window = SD.Workbench.ActiveWorkbenchWindow; if (window == null) { return; } @@ -96,7 +96,7 @@ namespace ICSharpCode.FormsDesigner.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(); } @@ -393,7 +393,7 @@ namespace ICSharpCode.FormsDesigner.Commands { FormsDesignerViewContent FormDesigner { get { - IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; + IWorkbenchWindow window = SD.Workbench.ActiveWorkbenchWindow; if (window == null) { return null; } @@ -457,7 +457,7 @@ namespace ICSharpCode.FormsDesigner.Commands } FormsDesignerViewContent FormDesigner { get { - IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; + IWorkbenchWindow window = SD.Workbench.ActiveWorkbenchWindow; if (window == null) { return null; } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs index 5425fb27f2..4d2474859c 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs @@ -4,6 +4,7 @@ using System; using System.Windows.Forms; using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.FormsDesigner.Gui; namespace ICSharpCode.FormsDesigner @@ -13,7 +14,7 @@ namespace ICSharpCode.FormsDesigner public override void Run() { using (ConfigureSideBarDialog configureSideBarDialog = new ConfigureSideBarDialog()) { - if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) { + if (configureSideBarDialog.ShowDialog(SD.WinForms.MainWin32Window) == DialogResult.OK) { ToolboxProvider.ReloadSideTabs(true); } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs index b4bbb08392..eda00c7ba3 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs @@ -218,7 +218,7 @@ namespace ICSharpCode.FormsDesigner.Gui fdiag.Multiselect = true; fdiag.CheckFileExists = true; - if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) { + if (fdiag.ShowDialog(SD.WinForms.MainWin32Window) == DialogResult.OK) { ControlDictionary["fileNameTextBox"].Text = string.Join(";", fdiag.FileNames); } } diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs index 74818b27fa..2a2c50e519 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs @@ -47,7 +47,7 @@ namespace ICSharpCode.FormsDesigner.Services #region Dialog functions public IWin32Window GetDialogOwnerWindow() { - return SD.Workbench.MainWin32Window; + return SD.WinForms.MainWin32Window; } public DialogResult ShowDialog(Form form) diff --git a/src/Main/Base/Project/Parser/ProjectContentContainer.cs b/src/Main/Base/Project/Parser/ProjectContentContainer.cs index 8e64f610a2..1f3c50b433 100644 --- a/src/Main/Base/Project/Parser/ProjectContentContainer.cs +++ b/src/Main/Base/Project/Parser/ProjectContentContainer.cs @@ -63,7 +63,7 @@ namespace ICSharpCode.SharpDevelop.Parser List filesToParse = new List(); foreach (var file in project.Items.OfType()) { if (IsParseableFile(file)) { - var fileName = FileName.Create(file.FileName); + var fileName = file.FileName; parserService.AddOwnerProject(fileName, project, startAsyncParse: false, isLinkedFile: file.IsLink); filesToParse.Add(fileName); } @@ -377,7 +377,7 @@ namespace ICSharpCode.SharpDevelop.Parser var filesToParse = ( from item in project.Items.OfType() where IsParseableFile(item) - select FileName.Create(item.FileName) + select item.FileName ).ToList(); SD.ParserService.LoadSolutionProjectsThread.AddJob( monitor => { @@ -480,7 +480,7 @@ namespace ICSharpCode.SharpDevelop.Parser } FileProjectItem fileProjectItem = e.ProjectItem as FileProjectItem; if (IsParseableFile(fileProjectItem)) { - var fileName = FileName.Create(e.ProjectItem.FileName); + var fileName = e.ProjectItem.FileName; SD.ParserService.AddOwnerProject(fileName, project, startAsyncParse: true, isLinkedFile: fileProjectItem.IsLink); } } @@ -500,7 +500,7 @@ namespace ICSharpCode.SharpDevelop.Parser FileProjectItem fileProjectItem = e.ProjectItem as FileProjectItem; if (IsParseableFile(fileProjectItem)) { - SD.ParserService.RemoveOwnerProject(FileName.Create(e.ProjectItem.FileName), project); + SD.ParserService.RemoveOwnerProject(e.ProjectItem.FileName, project); } } #endregion diff --git a/src/Main/Base/Project/Src/Project/Behaviors/ResXConverter.cs b/src/Main/Base/Project/Src/Project/Behaviors/ResXConverter.cs index 3dc3093395..0c79ac7b61 100644 --- a/src/Main/Base/Project/Src/Project/Behaviors/ResXConverter.cs +++ b/src/Main/Base/Project/Src/Project/Behaviors/ResXConverter.cs @@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.Project foreach (var resXFile in project.Items.OfType().Where(f => ".resx".Equals(Path.GetExtension(f.FileName), StringComparison.OrdinalIgnoreCase))) { using (var buffer = new MemoryStream()) { using (var reader = new ResXResourceReader(resXFile.FileName) { UseResXDataNodes = true }) - using (var writer = new ResXResourceWriter(buffer, t => ConvertTypeName(t, FileName.Create(resXFile.FileName), project))) { + using (var writer = new ResXResourceWriter(buffer, t => ConvertTypeName(t, resXFile.FileName, project))) { foreach (DictionaryEntry entry in reader) { writer.AddResource(entry.Key.ToString(), entry.Value); } diff --git a/src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs index bfbfc01043..104566c8ec 100644 --- a/src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs +++ b/src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs @@ -21,7 +21,7 @@ namespace ICSharpCode.SharpDevelop.Project IProject parentProject = this.Project; if (parentProject == null) return null; - var fileName = Core.FileName.Create(this.FileName); + var fileName = this.FileName; foreach (var project in parentProject.ParentSolution.Projects) { if (project.FileName == fileName) return project; diff --git a/src/Main/Base/Test/ServiceReferences/ProjectWithServiceReferencesTests.cs b/src/Main/Base/Test/ServiceReferences/ProjectWithServiceReferencesTests.cs index 66c2d9768d..05f467cf42 100644 --- a/src/Main/Base/Test/ServiceReferences/ProjectWithServiceReferencesTests.cs +++ b/src/Main/Base/Test/ServiceReferences/ProjectWithServiceReferencesTests.cs @@ -50,7 +50,7 @@ namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences ProjectItem GetFirstServiceReferenceFileInMSBuildProject(ServiceReferenceFileName fileName) { - return msbuildProject.Items.SingleOrDefault(item => item.FileName == fileName.Path); + return msbuildProject.Items.SingleOrDefault(item => item.FileName == FileName.Create(fileName.Path)); } ServiceReferencesProjectItem GetFirstWCFMetadataItemInMSBuildProject() @@ -65,7 +65,7 @@ namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences ProjectItem GetFileProjectItemInMSBuildProject(string fileName) { - return msbuildProject.Items.SingleOrDefault(item => item.FileName == fileName); + return msbuildProject.Items.SingleOrDefault(item => item.FileName == FileName.Create(fileName)); } ServiceReferenceProjectItem GetFirstWCFMetadataStorageItemInMSBuildProject() @@ -75,7 +75,7 @@ namespace ICSharpCode.SharpDevelop.Tests.ServiceReferences FileProjectItem GetFileFromMSBuildProject(string fileName) { - return msbuildProject.Items.Single(item => item.FileName == fileName) as FileProjectItem; + return msbuildProject.Items.Single(item => item.FileName == FileName.Create(fileName)) as FileProjectItem; } ReferenceProjectItem GetReferenceFromMSBuildProject(string name)