From be48f3c67c80602488856a563ed323782bedff8f Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 19 Sep 2010 23:07:33 +0200 Subject: [PATCH 01/33] applied patch "added support for events into Extract Interface" by Maciej Grabowsky - slightly changed FormatMemberForDisplay: replaced StringBuilder by IAmbience --- .../Src/Gui/Dialogs/ExtractInterfaceDialog.cs | 40 +++++++++---------- .../NRefactoryRefactoringProvider.cs | 6 +++ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs index 8f648650ec..76a8aa553f 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/ExtractInterfaceDialog.cs @@ -91,33 +91,29 @@ namespace ICSharpCode.SharpDevelop.Gui this.selectMembersListBox.Items.Add(FormatMemberForDisplay(p), CheckState.Checked); } } - } - - // TODO: i think these really belong in the model (ExtractInterfaceOptions) - // rather than the view's code-behind... - string FormatMemberForDisplay(IMethod m) - { - StringBuilder sb = new StringBuilder(); - sb.AppendFormat("{0} {1} ( ", m.ReturnType.Name, m.Name); - foreach (IParameter p in m.Parameters) { - if (p != m.Parameters[0]) { - sb.Append(" , "); + foreach (IEvent classEvent in c.Events) { + if (classEvent.IsPublic && !classEvent.IsStatic) { + this.possibleInterfaceMembers.Add(classEvent); + this.selectMembersListBox.Items.Add(FormatMemberForDisplay(classEvent), CheckState.Checked); } - sb.AppendFormat("{0} {1}", p.ReturnType.Name, p.Name); } - sb.Append(" );"); - return sb.ToString(); } - string FormatMemberForDisplay(IProperty p) + // TODO: i think these really belong in the model (ExtractInterfaceOptions) + // rather than the view's code-behind... + string FormatMemberForDisplay(IMember m) { - StringBuilder sb = new StringBuilder(); - sb.AppendFormat("{0} {1} {{ ", p.ReturnType.Name, p.Name); - if (p.CanGet) sb.Append("get;"); - if (p.CanSet && p.CanSet) sb.Append(" "); - if (p.CanSet) sb.Append("set;"); - sb.Append(" }"); - return sb.ToString(); + IAmbience ambience = options.ClassEntity.ProjectContent.Language.GetAmbience(); + + if (m is IProperty) + ambience.ConversionFlags |= ConversionFlags.IncludeBody; + ambience.ConversionFlags &= ~(ConversionFlags.ShowAccessibility | ConversionFlags.ShowModifiers); + + return ambience.Convert(m) + .Replace('\n', ' ') + .Replace('\t', ' ') + .Replace('\r', ' ') + .Replace(" ", " "); } #region Event Handlers diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs index 46674c35f5..cb95efba5b 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs @@ -116,6 +116,12 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring p.SetRegion.Block= BlockStatement.Null; p.Modifier = Modifiers.None; node = p; + } else { + if (an is EventDeclaration) { + EventDeclaration e = an as EventDeclaration; + e.Modifier = Modifiers.None; + node = e; + } } } From c8361dcdb426abc7d3bbac26e7289e59896fb8d4 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 21 Sep 2010 14:47:01 +0200 Subject: [PATCH 02/33] Allow expanding folding sections by double-clicking on the folded element. --- .../Folding/FoldingElementGenerator.cs | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs index f8e2d4ad50..40e16b52cd 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs @@ -3,6 +3,7 @@ using System; using System.Windows; +using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.TextFormatting; @@ -48,23 +49,24 @@ namespace ICSharpCode.AvalonEdit.Folding if (FoldingManager == null) return null; int foldedUntil = -1; - string title = null; + FoldingSection foldingSection = null; foreach (FoldingSection fs in FoldingManager.GetFoldingsAt(offset)) { if (fs.IsFolded) { if (fs.EndOffset > foldedUntil) { foldedUntil = fs.EndOffset; - title = fs.Title; + foldingSection = fs; } } } - if (foldedUntil > offset) { + if (foldedUntil > offset && foldingSection != null) { + string title = foldingSection.Title; if (string.IsNullOrEmpty(title)) title = "..."; var p = new VisualLineElementTextRunProperties(CurrentContext.GlobalTextRunProperties); p.SetForegroundBrush(Brushes.Gray); var textFormatter = TextFormatterFactory.Create(CurrentContext.TextView); var text = FormattedTextElement.PrepareText(textFormatter, title, p); - return new FoldingLineElement(text, foldedUntil - offset); + return new FoldingLineElement(foldingSection, text, foldedUntil - offset); } else { return null; } @@ -72,14 +74,27 @@ namespace ICSharpCode.AvalonEdit.Folding sealed class FoldingLineElement : FormattedTextElement { - public FoldingLineElement(TextLine text, int documentLength) : base(text, documentLength) + readonly FoldingSection fs; + + public FoldingLineElement(FoldingSection fs, TextLine text, int documentLength) : base(text, documentLength) { + this.fs = fs; } public override TextRun CreateTextRun(int startVisualColumn, ITextRunConstructionContext context) { return new FoldingLineTextRun(this, this.TextRunProperties); } + + protected internal override void OnMouseDown(MouseButtonEventArgs e) + { + if (e.ClickCount == 2 && e.ChangedButton == MouseButton.Left) { + fs.IsFolded = false; + e.Handled = true; + } else { + base.OnMouseDown(e); + } + } } sealed class FoldingLineTextRun : FormattedTextRun From 4f2269751fec54c9408d60651b874f22ce200703 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 21 Sep 2010 14:48:29 +0200 Subject: [PATCH 03/33] Fixed inaccuracy in GetVisualLineElementFromPosition (was incorrect by up to a half visual column) --- .../ICSharpCode.AvalonEdit/Rendering/TextView.cs | 4 ++-- .../ICSharpCode.AvalonEdit/Rendering/VisualLine.cs | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs index ed5338030b..ea3e74fe00 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs @@ -1307,10 +1307,10 @@ namespace ICSharpCode.AvalonEdit.Rendering { VisualLine vl = GetVisualLineFromVisualTop(visualPosition.Y); if (vl != null) { - int column = vl.GetVisualColumn(visualPosition); + int column = vl.GetVisualColumnFloor(visualPosition); // Debug.WriteLine(vl.FirstDocumentLine.LineNumber + " vc " + column); foreach (VisualLineElement element in vl.Elements) { - if (element.VisualColumn + element.VisualLength < column) + if (element.VisualColumn + element.VisualLength <= column) continue; return element; } diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs index fb153a8366..29ff6c1629 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs @@ -306,6 +306,7 @@ namespace ICSharpCode.AvalonEdit.Rendering /// /// Gets the visual column from a document position (relative to top left of the document). + /// If the user clicks between two visual columns, rounds to the nearest column. /// public int GetVisualColumn(Point point) { @@ -314,6 +315,17 @@ namespace ICSharpCode.AvalonEdit.Rendering return ch.FirstCharacterIndex + ch.TrailingLength; } + /// + /// Gets the visual column from a document position (relative to top left of the document). + /// If the user clicks between two visual columns, returns the first of those columns. + /// + public int GetVisualColumnFloor(Point point) + { + TextLine textLine = GetTextLineByVisualYPosition(point.Y); + CharacterHit ch = textLine.GetCharacterHitFromDistance(point.X); + return ch.FirstCharacterIndex; + } + /// /// Gets whether the visual line was disposed. /// From 4ef945f0f75347e56d978acce1dc44040589c31c Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 21 Sep 2010 18:42:20 +0200 Subject: [PATCH 04/33] Implemented SD-1457 - Client profile. Now creating or upgrading a project will adjust the in the app.config --- .../Profiler/Frontend/AddIn/Src/Extensions.cs | 2 +- .../Src/ShowClassDiagramCommand.cs | 2 +- .../WpfDesign.AddIn/Src/ProjectTools.cs | 2 +- .../Project/ICSharpCode.SharpDevelop.csproj | 4 + .../ProjectOptions/ApplicationSettings.cs | 2 +- .../Pads/ProjectBrowser/ProjectBrowserPad.cs | 17 ++ .../Project/Src/Project/CompilableProject.cs | 52 +++++ .../Base/Project/Src/Project/CustomTool.cs | 2 +- .../Project/Src/Project/TargetFramework.cs | 74 +++++-- .../Project/Src/Services/File/OpenedFile.cs | 6 +- .../FindReferencesAndRenameHelper.cs | 4 +- .../Project/Src/Util/FakeXmlViewContent.cs | 200 ++++++++++++++++++ 12 files changed, 346 insertions(+), 21 deletions(-) create mode 100644 src/Main/Base/Project/Src/Util/FakeXmlViewContent.cs diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Extensions.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Extensions.cs index fd54ef68a6..f064201fd3 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Extensions.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Extensions.cs @@ -37,7 +37,7 @@ namespace ICSharpCode.Profiler.AddIn if (!project.ReadOnly) { FileProjectItem file = new FileProjectItem(project, ItemType.Content, "ProfilingSessions\\" + Path.GetFileName(path)); ProjectService.AddProjectItem(project, file); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); project.Save(); } }; diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs index 8c6a9b8180..c5411ff762 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs @@ -59,7 +59,7 @@ namespace ClassDiagramAddin FileProjectItem fpi = new FileProjectItem(p, ItemType.Content); fpi.FileName = filename; ProjectService.AddProjectItem(p, fpi); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); p.Save(); FileService.OpenFile(filename); } diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs index a741e26896..2965fa4ff9 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ProjectTools.cs @@ -33,7 +33,7 @@ namespace ICSharpCode.WpfDesign.AddIn ProjectService.AddProjectItem(project,fileProjectItem); } project.Save(); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); } /// diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 36a63578cd..17d25d6b37 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -62,6 +62,9 @@ + + 3.5 + 3.0 @@ -727,6 +730,7 @@ + diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs index 6d84419c2e..d56899fafc 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs @@ -129,7 +129,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels FileProjectItem newItem = new FileProjectItem(project, ItemType.None); newItem.Include = "app.manifest"; ProjectService.AddProjectItem(project, newItem); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); } FileService.OpenFile(manifestFile); diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs index 2298d6d02e..af39b6dd74 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserPad.cs @@ -255,5 +255,22 @@ namespace ICSharpCode.SharpDevelop.Project } } #endregion + + static bool refreshViewEnqueued; + + public static void RefreshViewAsync() + { + WorkbenchSingleton.AssertMainThread(); + if (refreshViewEnqueued) + return; + refreshViewEnqueued = true; + WorkbenchSingleton.SafeThreadAsyncCall( + delegate { + refreshViewEnqueued = false; + if (instance != null) { + instance.ProjectBrowserControl.RefreshView(); + } + }); + } } } diff --git a/src/Main/Base/Project/Src/Project/CompilableProject.cs b/src/Main/Base/Project/Src/Project/CompilableProject.cs index b7be214348..cb86f2a782 100644 --- a/src/Main/Base/Project/Src/Project/CompilableProject.cs +++ b/src/Main/Base/Project/Src/Project/CompilableProject.cs @@ -1,6 +1,8 @@ // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) +using System.Xml.Linq; +using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Project.Converter; using System; using System.Collections.Generic; @@ -11,6 +13,7 @@ using System.Linq; using ICSharpCode.Core; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Internal.Templates; +using ICSharpCode.SharpDevelop.Util; namespace ICSharpCode.SharpDevelop.Project { @@ -430,6 +433,8 @@ namespace ICSharpCode.SharpDevelop.Project if (fx != null && (fx.IsBasedOn(TargetFramework.Net40) || fx.IsBasedOn(TargetFramework.Net40Client))) { AddDotnet40References(); } + if (fx != null) + UpdateAppConfig(fx); base.ProjectCreationComplete(); } @@ -545,6 +550,8 @@ namespace ICSharpCode.SharpDevelop.Project SetToolsVersion(newVersion.MSBuildVersion.Major + "." + newVersion.MSBuildVersion.Minor); } if (newFramework != null) { + UpdateAppConfig(newFramework); + ClientProfileTargetFramework clientProfile = newFramework as ClientProfileTargetFramework; if (clientProfile != null) { newFramework = clientProfile.FullFramework; @@ -572,6 +579,51 @@ namespace ICSharpCode.SharpDevelop.Project } } } + + void UpdateAppConfig(TargetFramework newFramework) + { + // When changing the target framework, update any existing app.config + // Also, for applications (not libraries), create an app.config is it is required for the target framework + bool createAppConfig = newFramework.RequiresAppConfigEntry && (this.OutputType != OutputType.Library && this.OutputType != OutputType.Module); + + string appConfigFileName = Path.Combine(this.Directory, "app.config"); + + if (!File.Exists(appConfigFileName)) { + if (createAppConfig) { + File.WriteAllText(appConfigFileName, + "" + Environment.NewLine + + "" + Environment.NewLine + + ""); + } else { + return; + } + } + + if (!IsFileInProject(appConfigFileName)) { + FileProjectItem fpi = new FileProjectItem(this, ItemType.None, "app.config"); + ProjectService.AddProjectItem(this, fpi); + FileService.FireFileCreated(appConfigFileName, false); + ProjectBrowserPad.RefreshViewAsync(); + } + + using (FakeXmlViewContent xml = new FakeXmlViewContent(appConfigFileName)) { + if (xml.Document != null) { + XElement configuration = xml.Document.Root; + XElement startup = configuration.Element("startup"); + if (startup == null) { + startup = new XElement("startup"); + configuration.AddFirst(startup); + } + XElement supportedRuntime = startup.Element("supportedRuntime"); + if (supportedRuntime == null) { + supportedRuntime = new XElement("supportedRuntime"); + startup.AddFirst(supportedRuntime); + } + supportedRuntime.SetAttributeValue("version", newFramework.SupportedRuntimeVersion); + supportedRuntime.SetAttributeValue("sku", newFramework.SupportedSku); + } + } + } #endregion } } diff --git a/src/Main/Base/Project/Src/Project/CustomTool.cs b/src/Main/Base/Project/Src/Project/CustomTool.cs index 0aba28af17..83b507284e 100644 --- a/src/Main/Base/Project/Src/Project/CustomTool.cs +++ b/src/Main/Base/Project/Src/Project/CustomTool.cs @@ -137,7 +137,7 @@ namespace ICSharpCode.SharpDevelop.Project ProjectService.AddProjectItem(project, outputItem); FileService.FireFileCreated(outputFileName, false); project.Save(); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); } return outputItem; } diff --git a/src/Main/Base/Project/Src/Project/TargetFramework.cs b/src/Main/Base/Project/Src/Project/TargetFramework.cs index 425e045431..e9040c686c 100644 --- a/src/Main/Base/Project/Src/Project/TargetFramework.cs +++ b/src/Main/Base/Project/Src/Project/TargetFramework.cs @@ -7,15 +7,35 @@ namespace ICSharpCode.SharpDevelop.Project { public class TargetFramework { - public readonly static TargetFramework Net20 = new TargetFramework("v2.0", ".NET Framework 2.0") { MinimumMSBuildVersion = new Version(2, 0) }; - public readonly static TargetFramework Net30 = new TargetFramework("v3.0", ".NET Framework 3.0") { BasedOn = Net20, MinimumMSBuildVersion = new Version(3, 5) }; - public readonly static TargetFramework Net35 = new TargetFramework("v3.5", ".NET Framework 3.5") { BasedOn = Net30, MinimumMSBuildVersion = new Version(3, 5) }; - public readonly static TargetFramework Net35Client = new ClientProfileTargetFramework(Net35); - public readonly static TargetFramework Net40 = new TargetFramework("v4.0", ".NET Framework 4.0") { BasedOn = Net35, MinimumMSBuildVersion = new Version(4, 0) }; - public readonly static TargetFramework Net40Client = new ClientProfileTargetFramework(Net40) { BasedOn = Net35Client }; + public readonly static TargetFramework Net20 = new TargetFramework("v2.0", ".NET Framework 2.0") { + SupportedRuntimeVersion = "v2.0.50727", + MinimumMSBuildVersion = new Version(2, 0) + }; + public readonly static TargetFramework Net30 = new TargetFramework("v3.0", ".NET Framework 3.0") { + SupportedRuntimeVersion = "v2.0.50727", + BasedOn = Net20, + MinimumMSBuildVersion = new Version(3, 5) + }; + public readonly static TargetFramework Net35 = new TargetFramework("v3.5", ".NET Framework 3.5") { + SupportedRuntimeVersion = "v2.0.50727", + BasedOn = Net30, + MinimumMSBuildVersion = new Version(3, 5) + }; + public readonly static TargetFramework Net35Client = new ClientProfileTargetFramework(Net35) { + RequiresAppConfigEntry = true + }; + public readonly static TargetFramework Net40 = new TargetFramework("v4.0", ".NET Framework 4.0") { + BasedOn = Net35, + MinimumMSBuildVersion = new Version(4, 0), + SupportedSku = ".NETFramework,Version=v4.0", + RequiresAppConfigEntry = true + }; + public readonly static TargetFramework Net40Client = new ClientProfileTargetFramework(Net40) { + BasedOn = Net35Client + }; public readonly static TargetFramework[] TargetFrameworks = { - Net40, Net35, Net30, Net20, Net40Client, Net35Client + Net40, Net40Client, Net35, Net35Client, Net30, Net20 }; public readonly static TargetFramework DefaultTargetFramework = Net40Client; @@ -31,6 +51,13 @@ namespace ICSharpCode.SharpDevelop.Project string name, displayName; + public TargetFramework(string name, string displayName) + { + this.name = name; + this.displayName = displayName; + this.SupportedRuntimeVersion = name; + } + public string Name { get { return name; } } @@ -39,7 +66,29 @@ namespace ICSharpCode.SharpDevelop.Project get { return displayName; } } + /// + /// Supported runtime version string for app.config + /// + public string SupportedRuntimeVersion { get; set; } + + /// + /// Supported SKU string for app.config. + /// + public string SupportedSku { get; set; } + + /// + /// Specifies whether this target framework requires an explicit app.config entry. + /// + public bool RequiresAppConfigEntry { get; set; } + + /// + /// Gets the minimum MSBuild version required to build projects with this target framework. + /// public Version MinimumMSBuildVersion { get; set; } + + /// + /// Gets the previous release of this target framework. + /// public TargetFramework BasedOn { get; set; } public bool IsBasedOn(TargetFramework potentialBase) @@ -53,12 +102,6 @@ namespace ICSharpCode.SharpDevelop.Project return false; } - public TargetFramework(string name, string displayName) - { - this.name = name; - this.displayName = displayName; - } - public override string ToString() { return DisplayName; @@ -73,7 +116,12 @@ namespace ICSharpCode.SharpDevelop.Project : base(fullFramework.Name + "Client", fullFramework.DisplayName + " Client Profile") { this.FullFramework = fullFramework; + this.SupportedRuntimeVersion = fullFramework.SupportedRuntimeVersion; this.MinimumMSBuildVersion = fullFramework.MinimumMSBuildVersion; + if (fullFramework.SupportedSku != null) + this.SupportedSku = fullFramework.SupportedSku + ",Profile=Client"; + else + this.SupportedSku = "Client"; } } } diff --git a/src/Main/Base/Project/Src/Services/File/OpenedFile.cs b/src/Main/Base/Project/Src/Services/File/OpenedFile.cs index d235a02871..c1cc021e6c 100644 --- a/src/Main/Base/Project/Src/Services/File/OpenedFile.cs +++ b/src/Main/Base/Project/Src/Services/File/OpenedFile.cs @@ -259,8 +259,12 @@ namespace ICSharpCode.SharpDevelop } - protected void SwitchedToView(IViewContent newView) + public void SwitchedToView(IViewContent newView) { + if (newView == null) + throw new ArgumentNullException("newView"); + if (currentView == newView) + return; if (currentView != null) { if (newView.SupportsSwitchToThisWithoutSaveLoad(this, currentView) || currentView.SupportsSwitchFromThisWithoutSaveLoad(this, newView)) diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs index 5cac72b0cb..e9dbf58076 100644 --- a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs +++ b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs @@ -86,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring ProjectService.AddProjectItem(project, projectItem); FileService.FireFileCreated(newInterfaceFileName, false); project.Save(); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); } } @@ -458,7 +458,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring ProjectService.AddProjectItem(project, projectItem); FileService.FireFileCreated(newFileName, false); project.Save(); - ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); + ProjectBrowserPad.RefreshViewAsync(); } } diff --git a/src/Main/Base/Project/Src/Util/FakeXmlViewContent.cs b/src/Main/Base/Project/Src/Util/FakeXmlViewContent.cs new file mode 100644 index 0000000000..3c677f7bb6 --- /dev/null +++ b/src/Main/Base/Project/Src/Util/FakeXmlViewContent.cs @@ -0,0 +1,200 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.IO; +using System.Xml; +using System.Xml.Linq; + +using ICSharpCode.SharpDevelop.Gui; + +namespace ICSharpCode.SharpDevelop.Util +{ + /// + /// IViewContent implementation that opens a file as XDocument and allows editing it, while synchronizing changes with any open editor. + /// + public sealed class FakeXmlViewContent : IViewContent + { + public FakeXmlViewContent(string fileName) + { + this.PrimaryFile = FileService.GetOrCreateOpenedFile(fileName); + this.oldView = this.PrimaryFile.CurrentView; + this.PrimaryFile.RegisterView(this); + this.PrimaryFile.SwitchedToView(this); + } + + IViewContent oldView; + XDocument document; + byte[] fileData; + + /// + /// Gets the document. + /// Can return null if there were load errors. + /// + public XDocument Document { + get { return document; } + } + + public void Dispose() + { + if (this.IsDisposed) + return; + this.IsDisposed = true; + if (document != null) { + this.PrimaryFile.MakeDirty(); + if (this.PrimaryFile.RegisteredViewContents.Count == 1) + this.PrimaryFile.SaveToDisk(); + } + this.PrimaryFile.UnregisterView(this); + if (oldView != null) + this.PrimaryFile.SwitchedToView(oldView); + if (Disposed != null) + Disposed(this, EventArgs.Empty); + } + + void IViewContent.Save(OpenedFile file, Stream stream) + { + if (document != null) + document.Save(stream, SaveOptions.DisableFormatting); + else if (fileData != null) + stream.Write(fileData, 0, fileData.Length); + } + + void IViewContent.Load(OpenedFile file, Stream stream) + { + document = null; + fileData = null; + + try { + document = XDocument.Load(stream, LoadOptions.PreserveWhitespace); + } catch (XmlException) { + stream.Position = 0; + fileData = new byte[(int)stream.Length]; + int pos = 0; + while (pos < fileData.Length) { + int c = stream.Read(fileData, pos, fileData.Length - pos); + if (c == 0) break; + pos += c; + } + } + } + + #region IViewContent stub implementation + event EventHandler IViewContent.TabPageTextChanged { + add { } + remove { } + } + + event EventHandler IViewContent.TitleNameChanged { + add { } + remove { } + } + + public event EventHandler Disposed; + + event EventHandler ICanBeDirty.IsDirtyChanged { + add { } + remove { } + } + + object IViewContent.Control { + get { + throw new NotImplementedException(); + } + } + + object IViewContent.InitiallyFocusedControl { + get { + throw new NotImplementedException(); + } + } + + IWorkbenchWindow IViewContent.WorkbenchWindow { + get { + throw new NotImplementedException(); + } + set { + throw new NotImplementedException(); + } + } + + string IViewContent.TabPageText { + get { + throw new NotImplementedException(); + } + } + + string IViewContent.TitleName { + get { + throw new NotImplementedException(); + } + } + + System.Collections.Generic.IList IViewContent.Files { + get { return new [] { PrimaryFile }; } + } + + public OpenedFile PrimaryFile { get; set; } + + ICSharpCode.Core.FileName IViewContent.PrimaryFileName { + get { return PrimaryFile.FileName; } + } + + public bool IsDisposed { get; private set; } + + bool IViewContent.IsReadOnly { + get { + throw new NotImplementedException(); + } + } + + bool IViewContent.IsViewOnly { + get { + throw new NotImplementedException(); + } + } + + System.Collections.Generic.ICollection IViewContent.SecondaryViewContents { + get { + throw new NotImplementedException(); + } + } + + bool ICanBeDirty.IsDirty { + get { + throw new NotImplementedException(); + } + } + + INavigationPoint IViewContent.BuildNavPoint() + { + throw new NotImplementedException(); + } + + bool IViewContent.SupportsSwitchFromThisWithoutSaveLoad(OpenedFile file, IViewContent newView) + { + return false; + } + + bool IViewContent.SupportsSwitchToThisWithoutSaveLoad(OpenedFile file, IViewContent oldView) + { + return false; + } + + void IViewContent.SwitchFromThisWithoutSaveLoad(OpenedFile file, IViewContent newView) + { + throw new NotImplementedException(); + } + + void IViewContent.SwitchToThisWithoutSaveLoad(OpenedFile file, IViewContent oldView) + { + throw new NotImplementedException(); + } + + object IServiceProvider.GetService(Type serviceType) + { + return null; + } + #endregion + } +} From afd2f384009de26be25c552e0545e4bdf4182fd2 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 21 Sep 2010 18:55:23 +0200 Subject: [PATCH 05/33] Mark SharpDevelop assemblies as Full/Client profile. --- .../Analysis/CodeAnalysis/CodeAnalysis.csproj | 2 ++ .../CodeCoverage/Project/CodeCoverage.csproj | 2 ++ .../Controller/Profiler.Controller.csproj | 1 + .../Frontend/AddIn/Profiler.AddIn.csproj | 2 ++ .../Frontend/Controls/Profiler.Controls.csproj | 1 + .../X64Converter/Profiler.X64Converter.csproj | 1 + .../SourceAnalysis/SourceAnalysis.csproj | 2 ++ .../Analysis/UnitTesting/UnitTesting.csproj | 2 ++ .../Boo/BooBinding/Project/BooBinding.csproj | 2 ++ .../Project/NRefactoryToBooConverter.csproj | 4 +++- .../CSharpBinding/Project/CSharpBinding.csproj | 2 ++ .../CppBinding/CppBinding/CppBinding.csproj | 3 ++- .../FSharpBinding/FSharpBinding.csproj | 2 ++ .../Project/Python.Build.Tasks.csproj | 2 ++ .../PythonBinding/Project/PythonBinding.csproj | 2 ++ .../Ruby/RubyBinding/Project/RubyBinding.csproj | 2 ++ .../Project/ICSharpCode.Scripting.csproj | 2 ++ .../VBNetBinding/Project/VBNetBinding.csproj | 2 ++ .../WixBinding/Project/WixBinding.csproj | 2 ++ .../XamlBinding/XamlBinding/XamlBinding.csproj | 2 ++ .../Debugger.AddIn/Debugger.AddIn.csproj | 2 ++ .../Debugger/Debugger.Core/Debugger.Core.csproj | 1 + .../AvalonEdit.AddIn/AvalonEdit.AddIn.csproj | 2 ++ .../ClassDiagram/ClassCanvas/ClassCanvas.csproj | 5 ++++- .../ClassDiagramAddin/ClassDiagramAddin.csproj | 2 ++ .../ClassDiagram/DiagramRouter/Diagrams.csproj | 5 ++++- .../ICSharpCode.Data.Addin.csproj | 3 ++- .../ICSharpCode.Data.Core.UI.csproj | 3 ++- .../ICSharpCode.Data.Core.csproj | 3 ++- .../ICSharpCode.Data.EDMDesigner.Core.UI.csproj | 2 ++ .../ICSharpCode.Data.EDMDesigner.Core.csproj | 2 ++ .../ICSharpCode.Data.SQLServer.csproj | 3 ++- .../FormsDesigner/Project/FormsDesigner.csproj | 2 ++ .../HexEditor/Project/HexEditor.csproj | 2 ++ .../IconEditor/IconEditor/IconEditor.csproj | 1 + .../IconEditorAddIn/IconEditorAddIn.csproj | 2 ++ .../ResourceEditor/Project/ResourceEditor.csproj | 2 ++ .../WpfDesign.AddIn/WpfDesign.AddIn.csproj | 2 ++ .../Project/WpfDesign.Designer.csproj | 1 + .../Project/WpfDesign.XamlDom.csproj | 1 + .../WpfDesign/WpfDesign/Project/WpfDesign.csproj | 1 + .../XmlEditor/Project/XmlEditor.csproj | 2 ++ .../AddInManager/Project/AddInManager.csproj | 1 + .../Misc/AddinScout/Project/AddinScout.csproj | 2 ++ .../Project/FiletypeRegisterer.csproj | 2 ++ src/AddIns/Misc/HelpViewer/HelpViewer.csproj | 2 ++ .../PInvokeAddIn/Project/PInvokeAddIn.csproj | 2 ++ .../ReflectorAddIn/Project/ReflectorAddIn.csproj | 2 ++ src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj | 2 ++ .../ICSharpCode.Reports.Addin.csproj | 2 ++ .../ICSharpCode.Reports.Core.csproj | 1 + src/AddIns/Misc/Reports/Irony/Irony.csproj | 1 + .../Project/ResourceToolkit.csproj | 2 ++ .../Project/SearchAndReplace.csproj | 2 ++ .../Project/SharpRefactoring.csproj | 2 ++ .../Misc/StartPage/Project/StartPage.csproj | 2 ++ .../UsageDataCollector.AddIn.csproj | 2 ++ .../VersionControl/GitAddIn/GitAddIn.csproj | 2 ++ .../SubversionAddIn/SubversionAddIn.csproj | 2 ++ .../ICSharpCode.AvalonEdit.csproj | 1 + .../NRefactory/Project/NRefactory.csproj | 1 + .../ICSharpCode.TreeView.csproj | 2 ++ .../TreeViewAdv/Aga.Controls/Aga.Controls.csproj | 7 +++++-- .../Base/Project/ICSharpCode.SharpDevelop.csproj | 2 ++ src/Main/Core/Project/ICSharpCode.Core.csproj | 7 ++++--- .../ICSharpCode.Core.Presentation.csproj | 1 + .../ICSharpCode.Core.WinForms.csproj | 1 + .../ICSharpCode.SharpDevelop.BuildWorker.csproj | 2 ++ .../app.config | 16 ++++++++++------ .../Project/ICSharpCode.SharpDevelop.Dom.csproj | 2 ++ .../ICSharpCode.SharpDevelop.Sda.csproj | 2 ++ .../ICSharpCode.SharpDevelop.Widgets.csproj | 2 ++ src/Main/StartUp/Project/StartUp.csproj | 2 ++ 73 files changed, 149 insertions(+), 19 deletions(-) diff --git a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj index ba576ebcfd..6f7eedc440 100644 --- a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj +++ b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj @@ -18,6 +18,8 @@ 4 false v4.0 + + obj\Debug\ diff --git a/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj b/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj index 141f841775..c763fe5e61 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj +++ b/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj @@ -17,6 +17,8 @@ 4 false v4.0 + + ..\..\..\..\..\AddIns\Analysis\CodeCoverage\ diff --git a/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj b/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj index 445077850f..cc1c4e1afa 100644 --- a/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj +++ b/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj @@ -46,6 +46,7 @@ false false true + Client true diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj index 27d2d43b97..e8166fca56 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj @@ -31,6 +31,8 @@ false false true + + true diff --git a/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj b/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj index 041d848735..3b2d690f6f 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj +++ b/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj @@ -34,6 +34,7 @@ false false true + Client true diff --git a/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj b/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj index 357d0e9fad..fdb8f1eb16 100644 --- a/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj +++ b/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj @@ -33,6 +33,7 @@ false false true + Client true diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj index 9e70831d50..951a4b3b56 100644 --- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj +++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj @@ -20,6 +20,8 @@ v4.0 False False + + obj\Debug\ diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj index f960ba04c0..96abcafe1b 100644 --- a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj +++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj @@ -18,6 +18,8 @@ 4 false v4.0 + + False diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj index e2177ae195..54f899fade 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj @@ -18,6 +18,8 @@ false v4.0 ..\..\..\..\..\..\AddIns\BackendBindings\BooBinding\ + + False diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj index 8d64b50b06..e078e67a19 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/NRefactoryToBooConverter.csproj @@ -1,4 +1,5 @@ - + + Library NRefactoryToBooConverter @@ -17,6 +18,7 @@ 4 false v4.0 + Client bin\Debug\ diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj index 54fb1484eb..702822c2f6 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj @@ -22,6 +22,8 @@ 4096 4 false + + true diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj index 26e32571ea..a2d0701068 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj @@ -18,7 +18,8 @@ 3.5 - + + False False OnBuildSuccess diff --git a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj index 0441ef52a5..cf7f2f3f1b 100644 --- a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj +++ b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj @@ -15,6 +15,8 @@ 4 false ..\..\..\..\AddIns\BackendBindings\FSharpBinding\ + + AnyCPU diff --git a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj index 6ec4510bcd..413080a8a7 100644 --- a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj +++ b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj @@ -13,6 +13,8 @@ false v4.0 OnBuildSuccess + + ..\..\..\..\..\..\AddIns\BackendBindings\PythonBinding\ diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index 61ffae8a3f..ab5948aaff 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -12,6 +12,8 @@ 4 false v4.0 + + ..\..\..\..\..\..\AddIns\BackendBindings\PythonBinding\ diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj index 269b986288..95c55fa59f 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.csproj @@ -13,6 +13,8 @@ False 4 false + + ..\..\..\..\..\..\AddIns\BackendBindings\RubyBinding\ diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj index c13e55a77a..cebf3e982f 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -13,6 +13,8 @@ 4 false ..\..\..\..\..\bin\ + + x86 diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj index 5de300d9f8..4f73f22bb4 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj @@ -22,6 +22,8 @@ AnyCPU 4096 ICSharpCode.VBNetBinding + + true diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj index f327d29142..24c783bec3 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj +++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj @@ -22,6 +22,8 @@ 4096 false Library + + true diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj index bb66b6d127..51c6082ced 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj @@ -14,6 +14,8 @@ false C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis v4.0 + + true diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj index 28d50e5915..3ee01a235b 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj +++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj @@ -39,6 +39,8 @@ false true ..\..\..\..\AddIns\Debugger\ + + true diff --git a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj index f46d9e9cb5..e93be30eff 100644 --- a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj +++ b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj @@ -37,6 +37,7 @@ false true v4.0 + Client true diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj index b195968cdc..93fa348b5f 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj @@ -17,6 +17,8 @@ False -Microsoft.Design#CA1014;-Microsoft.Design#CA2210 v4.0 + + true diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.csproj b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.csproj index 6e2176586c..6934cb8827 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.csproj +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.csproj @@ -1,4 +1,5 @@ - + + Library ClassCanvas @@ -9,6 +10,8 @@ False -Microsoft.Design#CA1063 v4.0 + + obj\ diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.csproj b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.csproj index 74a6e90241..93e6f59385 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.csproj +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.csproj @@ -14,6 +14,8 @@ false C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis v4.0 + + obj\Debug\ diff --git a/src/AddIns/DisplayBindings/ClassDiagram/DiagramRouter/Diagrams.csproj b/src/AddIns/DisplayBindings/ClassDiagram/DiagramRouter/Diagrams.csproj index 2ac0f7eb8e..c41da81c47 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/DiagramRouter/Diagrams.csproj +++ b/src/AddIns/DisplayBindings/ClassDiagram/DiagramRouter/Diagrams.csproj @@ -1,4 +1,5 @@ - + + Library DiagramRouter @@ -8,6 +9,8 @@ {0991423A-DBF6-4C89-B365-A1DF1EB32E42} OnBuildSuccess v4.0 + + bin\Debug\ diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj index 39cda0833c..7556a482a5 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj @@ -13,7 +13,8 @@ 3.5 - + + publish\ true Disk diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj index 6550cb56f9..a7fa8aa08a 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj @@ -18,7 +18,8 @@ 3.5 - + + publish\ true Disk diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj index 40de5f684d..e14c6ca53f 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj @@ -18,7 +18,8 @@ 3.5 - + + publish\ true Disk diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj index 348f69058a..e1e068e358 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj @@ -33,6 +33,8 @@ false false true + + true diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj index 5de1e3c477..54aa95b910 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj @@ -32,6 +32,8 @@ false false true + + true diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj index b03a378a17..0674b48c92 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj @@ -16,7 +16,8 @@ 3.5 - + + publish\ true Disk diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj index 0a276a0680..f01bd5b891 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj @@ -27,6 +27,8 @@ ..\..\..\..\Main\ICSharpCode.SharpDevelop.snk False File + + True diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj index 6cdaf438ea..fe3890f6b1 100644 --- a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj +++ b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj @@ -16,6 +16,8 @@ OnBuildSuccess False v4.0 + + ..\..\..\..\..\AddIns\DisplayBindings\HexEditor\ diff --git a/src/AddIns/DisplayBindings/IconEditor/IconEditor/IconEditor.csproj b/src/AddIns/DisplayBindings/IconEditor/IconEditor/IconEditor.csproj index c45cdf3b60..2deb223ad5 100644 --- a/src/AddIns/DisplayBindings/IconEditor/IconEditor/IconEditor.csproj +++ b/src/AddIns/DisplayBindings/IconEditor/IconEditor/IconEditor.csproj @@ -19,6 +19,7 @@ Always ..\..\..\..\..\AddIns\DisplayBindings\IconEditor\ v4.0 + Client obj\Debug\ diff --git a/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/IconEditorAddIn.csproj b/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/IconEditorAddIn.csproj index dab37c4d75..fff2fd2f0a 100644 --- a/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/IconEditorAddIn.csproj +++ b/src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/IconEditorAddIn.csproj @@ -18,6 +18,8 @@ 4 false v4.0 + + obj\Debug\ diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj index 01826f31b2..ab36b14336 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj @@ -22,6 +22,8 @@ 4 false v4.0 + + true diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj index 89afcec4a7..ecaabadaa3 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj @@ -13,6 +13,8 @@ 4 false v4.0 + + true diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj index dcff7747f2..7e79406020 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj @@ -21,6 +21,7 @@ File False -Microsoft.Performance#CA1800;-Microsoft.Performance#CA1810;-Microsoft.Performance#CA1822 + Client true diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj index 2b6c4e7b5b..7fc0d99da0 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/WpfDesign.XamlDom.csproj @@ -21,6 +21,7 @@ ..\..\..\..\..\..\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.XamlDom.xml v4.0 C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis + Client true diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj index ec61bb6254..d868d6287a 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj @@ -20,6 +20,7 @@ False -Microsoft.Globalization#CA1303 v4.0 + Client true diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj index 0297a280c3..c39ad9f90a 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj @@ -13,6 +13,8 @@ 4 false ..\..\..\..\..\AddIns\DisplayBindings\XmlEditor\ + + true diff --git a/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj b/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj index b94de3f14f..ebc481d257 100644 --- a/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj +++ b/src/AddIns/Misc/AddInManager/Project/AddInManager.csproj @@ -17,6 +17,7 @@ 4 false v4.0 + Client ..\..\..\..\..\AddIns\Misc\AddInManager\ diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj index 92e1772274..2a5e5555b3 100644 --- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj +++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj @@ -23,6 +23,8 @@ 4096 false v4.0 + + true diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj index 8d18de17c3..817692081c 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj @@ -23,6 +23,8 @@ 4096 false v4.0 + + true diff --git a/src/AddIns/Misc/HelpViewer/HelpViewer.csproj b/src/AddIns/Misc/HelpViewer/HelpViewer.csproj index 99d57620e3..d4e6c0a129 100644 --- a/src/AddIns/Misc/HelpViewer/HelpViewer.csproj +++ b/src/AddIns/Misc/HelpViewer/HelpViewer.csproj @@ -13,6 +13,8 @@ 4 false OnBuildSuccess + + x86 diff --git a/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj b/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj index 49ead0c677..6f56617e97 100644 --- a/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj +++ b/src/AddIns/Misc/PInvokeAddIn/Project/PInvokeAddIn.csproj @@ -17,6 +17,8 @@ AnyCPU 4096 v4.0 + + true diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/ReflectorAddIn.csproj b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/ReflectorAddIn.csproj index b045ee6f49..ecd93b97b7 100644 --- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/ReflectorAddIn.csproj +++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/ReflectorAddIn.csproj @@ -14,6 +14,8 @@ False 4 false + + true diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj index d154c169e4..47fec1f9b4 100644 --- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj +++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj @@ -19,6 +19,8 @@ AnyCPU 4096 v4.0 + + true diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj index aa25d6c66c..d4a346611b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj @@ -34,6 +34,8 @@ false false true + + False diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index dd55887c0f..957a28d28a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -35,6 +35,7 @@ false false true + Client False diff --git a/src/AddIns/Misc/Reports/Irony/Irony.csproj b/src/AddIns/Misc/Reports/Irony/Irony.csproj index 1070224e08..b76a4b120d 100644 --- a/src/AddIns/Misc/Reports/Irony/Irony.csproj +++ b/src/AddIns/Misc/Reports/Irony/Irony.csproj @@ -25,6 +25,7 @@ False false 0649 + Client true diff --git a/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj b/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj index f89ab0b5d6..6a7d8e2966 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj +++ b/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj @@ -20,6 +20,8 @@ False -Microsoft.Design#CA1020 v4.0 + + obj\Debug\ diff --git a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj index 94f6ec3497..837045d92b 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj +++ b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj @@ -13,6 +13,8 @@ 4 false v4.0 + + true diff --git a/src/AddIns/Misc/SharpRefactoring/Project/SharpRefactoring.csproj b/src/AddIns/Misc/SharpRefactoring/Project/SharpRefactoring.csproj index 16a03c7ec6..c1afb0c6e8 100644 --- a/src/AddIns/Misc/SharpRefactoring/Project/SharpRefactoring.csproj +++ b/src/AddIns/Misc/SharpRefactoring/Project/SharpRefactoring.csproj @@ -15,6 +15,8 @@ v4.0 "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" ..\..\..\..\..\AddIns\Misc\SharpRefactoring\ + + true diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj b/src/AddIns/Misc/StartPage/Project/StartPage.csproj index fbd8c2fcc7..b5e1181b14 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj @@ -21,6 +21,8 @@ 4096 v4.0 false + + true diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj index 1a096aaad9..d5fe6e822f 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj @@ -13,6 +13,8 @@ False 4 false + + x86 diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj b/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj index 64debaa93f..90d55707f5 100644 --- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj +++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj @@ -14,6 +14,8 @@ false v4.0 SD4 + + true diff --git a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj index 4ed0346461..0c6c13ff5e 100644 --- a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj +++ b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj @@ -16,6 +16,8 @@ 4 false ..\..\..\..\AddIns\VersionControl\SubversionAddIn\ + + true diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj index 93235d0379..d572f6c8b0 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj @@ -23,6 +23,7 @@ ..\..\..\..\bin\ ..\..\..\..\bin\ICSharpCode.AvalonEdit.xml 1607 + Client true diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index 780fe64109..65644ee529 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -25,6 +25,7 @@ False -Microsoft.Design#CA1002;-Microsoft.Design#CA1020;-Microsoft.Design#CA1051;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1305;-Microsoft.Naming#CA1704;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1805;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2227 v4.0 + Client False diff --git a/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj b/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj index e5a04413cc..c1877220ae 100644 --- a/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj +++ b/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj @@ -15,6 +15,8 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 ..\..\..\..\bin\ + + true diff --git a/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj b/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj index 40dd61a3a7..708d96ad40 100644 --- a/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj +++ b/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -19,7 +20,9 @@ true key.snk - v4.0 + v4.0 + Client + true diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 17d25d6b37..c285fa90c5 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -26,6 +26,8 @@ 4 ..\..\..\..\bin\ v4.0 + + Full diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj index 3179aef442..23afdaf3ec 100644 --- a/src/Main/Core/Project/ICSharpCode.Core.csproj +++ b/src/Main/Core/Project/ICSharpCode.Core.csproj @@ -22,6 +22,7 @@ False false C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis + Client true @@ -138,8 +139,8 @@ - - - + + + \ No newline at end of file diff --git a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj index ecf4c7e574..0787ad21d7 100644 --- a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj +++ b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj @@ -21,6 +21,7 @@ File False -Microsoft.Performance#CA1810 + Client true diff --git a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj index bc4adb189b..895c66d562 100644 --- a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj +++ b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj @@ -18,6 +18,7 @@ ..\ICSharpCode.SharpDevelop.snk False File + Client true diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj index 7051c58dae..4a354056e7 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj @@ -19,6 +19,8 @@ File False -Microsoft.Globalization#CA1303 + + true diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config index 5c14c1929e..ddfeac4207 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config @@ -1,18 +1,22 @@ + + + + - - + + - - + + - - + + diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj index 619d5838ed..f8dc255b05 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/ICSharpCode.SharpDevelop.Dom.csproj @@ -24,6 +24,8 @@ v4.0 False -Microsoft.Design#CA1002;-Microsoft.Design#CA1063;-Microsoft.Performance#CA1800;-Microsoft.Security#CA2104 + + obj\Debug\ diff --git a/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj b/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj index 7a099c836b..fdc0181527 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.csproj @@ -23,6 +23,8 @@ ..\ICSharpCode.SharpDevelop.snk False File + + diff --git a/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj.user b/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj.user index df9dd69bfd..5b923b0708 100644 --- a/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj.user +++ b/src/Libraries/TreeViewAdv/Aga.Controls/Aga.Controls.csproj.user @@ -1,4 +1,5 @@ - + + diff --git a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs index 81db9d8614..e8f8968916 100644 --- a/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs +++ b/src/Main/Base/Project/Src/Gui/AbstractViewContent.cs @@ -510,14 +510,20 @@ namespace ICSharpCode.SharpDevelop.Gui #endregion #region IServiceProvider - ServiceContainer _services=new ServiceContainer(); + ServiceContainer services = new ServiceContainer(); - public object GetService(Type serviceType){ - return _services.GetService(serviceType); + public object GetService(Type serviceType) + { + object obj = services.GetService(serviceType); + if (obj == null) { + if (serviceType.IsInstanceOfType(this)) + return this; + } + return obj; } public ServiceContainer Services { - get { return _services; } + get { return services; } } #endregion diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj index 9875e3fb46..70f8c2d0af 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj @@ -17,8 +17,7 @@ False File v4.0 - - + Client False From 005cec40231e95918b2b63aca6e1fe77c4363ea9 Mon Sep 17 00:00:00 2001 From: mrward Date: Tue, 21 Sep 2010 20:25:56 +0100 Subject: [PATCH 07/33] Add simple support for property code completion in the IronPython addin. --- .../Project/PythonBinding.csproj | 1 + .../Project/Src/PythonPropertyResolver.cs | 57 +++++++++++++ .../Project/Src/PythonResolver.cs | 3 + .../Test/PythonBinding.Tests.csproj | 1 + .../Resolver/ResolveClassPropertyTests.cs | 85 +++++++++++++++++++ 5 files changed, 147 insertions(+) create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index ab5948aaff..c401b03d1d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -107,6 +107,7 @@ + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs new file mode 100644 index 0000000000..7d4d93c20f --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs @@ -0,0 +1,57 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.SharpDevelop.Dom; + +namespace ICSharpCode.PythonBinding +{ + public class PythonPropertyResolver : IPythonResolver + { + PythonClassResolver classResolver; + + public PythonPropertyResolver(PythonClassResolver classResolver) + { + this.classResolver = classResolver; + } + + public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + { + IProperty property = FindProperty(resolverContext, expressionResult); + if (property != null) { + return CreateMemberResolveResult(property); + } + return null; + } + + IProperty FindProperty(PythonResolverContext resolverContext, ExpressionResult expressionResult) + { + MemberName memberName = new MemberName(expressionResult.Expression); + IClass matchingClass = FindClass(resolverContext, memberName.Type); + if (matchingClass != null) { + return FindProperty(matchingClass, memberName.Name); + } + return null; + } + + MemberResolveResult CreateMemberResolveResult(IProperty property) + { + return new MemberResolveResult(null, null, property); + } + + IClass FindClass(PythonResolverContext resolverContext, string typeName) + { + return classResolver.GetClass(resolverContext, typeName); + } + + IProperty FindProperty(IClass matchingClass, string memberName) + { + foreach (IProperty property in matchingClass.Properties) { + if (property.Name == memberName) { + return property; + } + } + return null; + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs index ce52a7413a..b577a14725 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs @@ -19,16 +19,19 @@ namespace ICSharpCode.PythonBinding PythonStandardModuleResolver standardModuleResolver = new PythonStandardModuleResolver(); PythonSelfResolver selfResolver = new PythonSelfResolver(); PythonMethodResolver methodResolver; + PythonPropertyResolver propertyResolver; List resolvers = new List(); public PythonResolver() { methodResolver = new PythonMethodResolver(classResolver, standardModuleResolver); + propertyResolver = new PythonPropertyResolver(classResolver); resolvers.Add(importResolver); resolvers.Add(classResolver); resolvers.Add(standardModuleResolver); + resolvers.Add(propertyResolver); resolvers.Add(methodResolver); resolvers.Add(selfResolver); resolvers.Add(namespaceResolver); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 6e1c2e4ba9..4c49b36df8 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -351,6 +351,7 @@ + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs new file mode 100644 index 0000000000..4524ba60bc --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs @@ -0,0 +1,85 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.PythonBinding; +using ScriptingUtils = ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveClassPropertyTests + { + ResolveResult result; + ParseInformation parseInfo; + IProperty myClassProperty; + MockClass myClass; + + void ResolveClassProperty() + { + PythonResolverContext context = new PythonResolverContext(parseInfo); + ExpressionResult expression = new ExpressionResult("MyClass.MyProperty"); + + PythonResolver resolver = new PythonResolver(); + result = resolver.Resolve(context, expression); + } + + void CreateParseInfoWithOneClass() + { + ScriptingUtils.MockProjectContent projectContent = new ScriptingUtils.MockProjectContent(); + myClass = new MockClass(projectContent, "MyClass"); + + projectContent.ClassToReturnFromGetClass = myClass; + projectContent.ClassNameForGetClass = "MyClass"; + + myClassProperty = CreateProperty(myClass); + myClass.Properties.Add(myClassProperty); + + DefaultCompilationUnit unit = new DefaultCompilationUnit(projectContent); + parseInfo = new ParseInformation(unit); + } + + IProperty CreateProperty(IClass c) + { + return new DefaultProperty(c, "MyProperty"); + } + + [Test] + public void Resolve_ClassHasOneProperty_ReturnsMemberResolveResult() + { + CreateParseInfoWithOneClass(); + ResolveClassProperty(); + MemberResolveResult memberResolveResult = result as MemberResolveResult; + + Assert.IsNotNull(memberResolveResult); + } + + [Test] + public void Resolve_ClassHasOneProperty_MemberResolveResultResolvedTypeIsMyClassProperty() + { + CreateParseInfoWithOneClass(); + ResolveClassProperty(); + MemberResolveResult memberResolveResult = result as MemberResolveResult; + IMember resolvedMember = memberResolveResult.ResolvedMember; + + Assert.AreEqual(myClassProperty, resolvedMember); + } + + [Test] + public void Resolve_ClassHasTwoProperties_MemberResolveResultResolvedTypeIsSecondClassProperty() + { + CreateParseInfoWithOneClass(); + DefaultProperty extraProperty = new DefaultProperty(myClass, "ExtraProperty"); + myClass.Properties.Insert(0, extraProperty); + ResolveClassProperty(); + + MemberResolveResult memberResolveResult = result as MemberResolveResult; + IMember resolvedMember = memberResolveResult.ResolvedMember; + + Assert.AreEqual(myClassProperty, resolvedMember); + } + } +} From 1af9cd2f24b245d24785a452e2815be10568e8e6 Mon Sep 17 00:00:00 2001 From: mrward Date: Wed, 22 Sep 2010 16:21:59 +0100 Subject: [PATCH 08/33] Fix SD-1698 - Exception when trying to open F# project properties --- .../BackendBindings/FSharpBinding/FSharpBinding.addin | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin index 358644ec2c..a7eba77fd5 100644 --- a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin +++ b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin @@ -60,16 +60,16 @@ - - - - From 7b72aa9d78ce4b720c7973e476e32867d8513f72 Mon Sep 17 00:00:00 2001 From: mrward Date: Wed, 22 Sep 2010 20:24:09 +0100 Subject: [PATCH 09/33] Change ASP.NET web page and web service project so the OutputPath is set to bin when a new project is created. --- data/templates/project/CSharp/WebService.xpt | 9 +- .../project/CSharp/WebpageProject.xpt | 10 +- .../ResolveBuiltInRoundMethodTestFixture.cs | 117 --------------- ...onsoleFromSystemImportEverythingFixture.cs | 57 -------- .../ResolveConsoleWriteLineTestFixture.cs | 61 -------- ...hodFromSysImportExitAsMyExitTestFixture.cs | 47 ------ ...temWindowsFormsImportedAsFooTestFixture.cs | 52 ------- ...WindowsWithImportSystemAsFooTestFixture.cs | 45 ------ .../Resolver/ResolveFromImportTestFixture.cs | 55 ------- ...tedMathModuleCompletionItemsTestFixture.cs | 55 ------- .../ResolveLocalClassInstanceTestFixture.cs | 101 ------------- ...veMethodFromUnknownImportAllTestFixture.cs | 37 ----- ...ethodWhenFromImportIsUnknownTestFixture.cs | 36 ----- ...lveMethodWhenImportIsUnknownTestFixture.cs | 36 ----- .../ResolveSysModuleExitMethodTestFixture.cs | 136 ------------------ ...olveSysModuleImportedAsMySysTestFixture.cs | 42 ------ ...esolveSysModuleUnknownMethodTestFixture.cs | 36 ----- .../ResolveSystemConsoleTestFixture.cs | 111 -------------- .../ResolveSystemImportTestFixture.cs | 59 -------- ...olveSystemImportedAsMySystemTestFixture.cs | 68 --------- .../ResolveSystemNamespaceTestFixture.cs | 67 --------- ...emNamespaceWithMissingImportTestFixture.cs | 44 ------ ...WindowsFormsWithImportSystemTestFixture.cs | 45 ------ ...ystemWindowsWithImportSystemTestFixture.cs | 45 ------ ...ystemWithImportSystemWindowsTestFixture.cs | 39 ----- ...veTanMethodFromMathImportAllTestFixture.cs | 63 -------- ...ethodFromMathImportCosAndTanTestFixture.cs | 60 -------- .../Test/Resolver/ResolveTestFixtureBase.cs | 41 ------ ...temWindowsFormsImportTextBoxTestFixture.cs | 52 ------- ...dowsFormsImportedAsMyTextBoxTestFixture.cs | 52 ------- .../ResolveUnknownNamespaceTestFixture.cs | 43 ------ 31 files changed, 16 insertions(+), 1705 deletions(-) delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveBuiltInRoundMethodTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs diff --git a/data/templates/project/CSharp/WebService.xpt b/data/templates/project/CSharp/WebService.xpt index 5e1e57e2c8..46785eafbc 100644 --- a/data/templates/project/CSharp/WebService.xpt +++ b/data/templates/project/CSharp/WebService.xpt @@ -31,9 +31,16 @@ Library Properties - bin\ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + + + bin\ + + + + bin\ + Library - bin\ {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - + + + bin\ + + + + bin\ + exitMethods = GetRoundMethods(); - Assert.AreEqual(2, exitMethods.Count); - } - - List GetRoundMethods() - { - return GetRoundMethods(-1); - } - - List GetRoundMethods(int parameterCount) - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("round", parameterCount, methods.ToArray()); - } - - [Test] - public void BothRoundMethodsArePublic() - { - foreach (IMethod method in GetRoundMethods()) { - Assert.IsTrue(method.IsPublic); - } - } - - [Test] - public void BothRoundMethodsHaveClassWithNameOfSys() - { - foreach (IMethod method in GetRoundMethods()) { - Assert.AreEqual("__builtin__", method.DeclaringType.Name); - } - } - - [Test] - public void OneRoundMethodHasTwoParameters() - { - int parameterCount = 2; - Assert.AreEqual(1, GetRoundMethods(parameterCount).Count); - } - - [Test] - public void RoundMethodParameterNameIsNumber() - { - IParameter parameter = GetFirstRoundMethodParameter(); - Assert.AreEqual("number", parameter.Name); - } - - IParameter GetFirstRoundMethodParameter() - { - int parameterCount = 1; - List methods = GetRoundMethods(parameterCount); - IMethod method = methods[0]; - return method.Parameters[0]; - } - - [Test] - public void RoundMethodParameterReturnTypeIsDouble() - { - IParameter parameter = GetFirstRoundMethodParameter(); - Assert.AreEqual("Double", parameter.ReturnType.Name); - } - - [Test] - public void RoundMethodParameterConvertedToStringUsingAmbienceReturnsDoubleNumberString() - { - IAmbience ambience = new CSharpAmbience(); - string text = ambience.Convert(GetFirstRoundMethodParameter()); - Assert.AreEqual("double number", text); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs deleted file mode 100644 index 0d3d17de7a..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleFromSystemImportEverythingFixture.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveFromSystemImportEverythingFixture : ResolveTestFixtureBase - { - MockClass consoleClass; - - protected override ExpressionResult GetExpressionResult() - { - consoleClass = new MockClass(projectContent, "System.Console"); - projectContent.ClassToReturnFromGetClass = consoleClass; - projectContent.ClassNameForGetClass = "System.Console"; - - List namespaceItems = new List(); - projectContent.AddExistingNamespaceContents("System", namespaceItems); - - return new ExpressionResult("Console", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from System import *\r\n" + - "Console\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultResolvedClassIsConsoleClass() - { - Assert.AreEqual(consoleClass, TypeResolveResult.ResolvedClass); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - - [Test] - public void ProjectContentNamespaceExistsReturnsTrueForSystem() - { - Assert.IsTrue(projectContent.NamespaceExists("System")); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs deleted file mode 100644 index d679641047..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTestFixture.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests that the expression "Console.WriteLine" is correctly - /// resolved. - /// - [TestFixture] - public class ResolveConsoleWriteLineTestFixture : ResolveTestFixtureBase - { - MockClass systemConsoleClass; - - protected override ExpressionResult GetExpressionResult() - { - systemConsoleClass = new MockClass(projectContent, "System.Console"); - projectContent.ClassToReturnFromGetClass = systemConsoleClass; - projectContent.ClassNameForGetClass = "Console"; - return new ExpressionResult("Console.WriteLine", new DomRegion(2, 2), null, null); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "Console.WriteLine\r\n"; - } - - [Test] - public void ResolveResultExists() - { - Assert.IsNotNull(resolveResult); - } - - /// - /// Gets the class name used in IProjectContent.GetClass call. - /// - [Test] - public void GetClassName() - { - Assert.AreEqual("Console", projectContent.GetClassName); - } - - [Test] - public void MethodNameResolveIsWriteLine() - { - MethodGroupResolveResult methodResolveResult = (MethodGroupResolveResult)resolveResult; - Assert.AreEqual("WriteLine", methodResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs deleted file mode 100644 index ef2e0dfc68..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTestFixture.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveExitMethodFromSysImportExitAsMyExitTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("myexit", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from sys import exit as myexit\r\n" + - "myexit\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsExit() - { - Assert.AreEqual("exit", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs deleted file mode 100644 index 71c48342dc..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooTextBoxFromSystemWindowsFormsImportedAsFooTestFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTextBoxFromSystemWindowsFormsImportedAsFooTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); - projectContent.ClassToReturnFromGetClass = textBoxClass; - projectContent.ClassNameForGetClass = "System.Windows.Forms.TextBox"; - - return new ExpressionResult("Foo.TextBox", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import System.Windows.Forms as Foo\r\n" + - "Foo.TextBox\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsTypeResolveResult() - { - Assert.IsTrue(resolveResult is TypeResolveResult); - } - - [Test] - public void ResolveResultResolveClassNameIsTextBox() - { - Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs deleted file mode 100644 index 3e5a03b3f5..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTestFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveFooWindowsWithImportSystemAsFooTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockProjectContent referencedContent = new MockProjectContent(); - List namespaceItems = new List(); - referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); - projectContent.ReferencedContents.Add(referencedContent); - - return new ExpressionResult("Foo.Windows"); - } - - protected override string GetPythonScript() - { - return - "import System as Foo\r\n" + - "Foo.Windows\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemWindowsNamespace() - { - Assert.AreEqual("System.Windows", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs deleted file mode 100644 index 87d3f74d04..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTestFixture.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests that the PythonResolver resolves "from System" to - /// a namespace. - /// - [TestFixture] - public class ResolveFromImportTestFixture - { - PythonResolver resolver; - MockProjectContent mockProjectContent; - PythonImportModuleResolveResult resolveResult; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - - mockProjectContent = new MockProjectContent(); - DefaultCompilationUnit cu = new DefaultCompilationUnit(mockProjectContent); - cu.ErrorsDuringCompile = true; - cu.FileName = @"C:\Projects\Test\test.py"; - ParseInformation parseInfo = new ParseInformation(cu); - - string python = "from System"; - PythonExpressionFinder finder = new PythonExpressionFinder(); - ExpressionResult expressionResult = finder.FindExpression(python, python.Length); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as PythonImportModuleResolveResult; - } - - [Test] - public void NamespaceResolveResultFound() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void NamespaceName() - { - Assert.AreEqual("System", resolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs deleted file mode 100644 index a042e84bb1..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTestFixture.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; - -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveFromMathImportedMathModuleCompletionItemsTestFixture : ResolveTestFixtureBase - { - List GetCompletionResults() - { - return resolveResult.GetCompletionData(projectContent); - } - - protected override ExpressionResult GetExpressionResult() - { - string code = GetPythonScript(); - PythonExpressionFinder finder = new PythonExpressionFinder(); - return finder.FindExpression(code, code.Length); - } - - protected override string GetPythonScript() - { - return "from math import"; - } - - [Test] - public void CompletionResultsContainCosMethodFromMathModule() - { - IMethod method = PythonCompletionItemsHelper.FindMethodFromCollection("cos", GetCompletionResults()); - Assert.IsNotNull(method); - } - - [Test] - public void ExpressionResultContextShowItemReturnsTrueForIMethod() - { - MockProjectContent projectContent = new MockProjectContent(); - DefaultCompilationUnit unit = new DefaultCompilationUnit(projectContent); - DefaultClass c = new DefaultClass(unit, "MyClass"); - DefaultMethod method = new DefaultMethod(c, "Test"); - - Assert.IsTrue(expressionResult.Context.ShowEntry(method)); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs deleted file mode 100644 index c52bdfdbf3..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTestFixture.cs +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Given code: - /// - /// a = Class1() - /// - /// Check that the type of "a" can be obtained by the resolver. - /// - [TestFixture] - [Ignore("Disabled local variable resolution for SD 3.0")] - public class ResolveLocalClassInstanceTestFixture - { - PythonResolver resolver; - ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; - LocalResolveResult resolveResult; - MockClass testClass; - ICompilationUnit compilationUnit; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - - mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); - testClass = new MockClass(mockProjectContent, "Test.Test1"); - mockProjectContent.ClassesInProjectContent.Add(testClass); - mockProjectContent.ClassToReturnFromGetClass = testClass; - mockProjectContent.ClassNameForGetClass = "Test.Test1"; - - compilationUnit = new DefaultCompilationUnit(mockProjectContent); - compilationUnit.FileName = @"C:\Projects\Test\test.py"; - ParseInformation parseInfo = new ParseInformation(compilationUnit); - - string python = "a = Test1()\r\n" + - "a"; - ExpressionResult expressionResult = new ExpressionResult("a", new DomRegion(2, 1), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as LocalResolveResult; - } - - [Test] - public void GetTypeOfInstance() - { - string code = "a = Class1()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - /// - /// Tests that the NameExpression in the resolver is reset so the second assignment - /// does not override the first. - /// - [Test] - public void DifferentTypeCreatedLast() - { - string code = "a = Class1()\r\n" + - "b = Class2()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void StringAssignmentShouldNotResolve() - { - string code = "a = \"test\""; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void NullCodeShouldNotResolve() - { - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", null)); - } - - [Test] - public void ResolveResultIsLocalResolveResult() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void ResolveResultVariableName() - { - Assert.AreEqual(resolveResult.VariableName, "a"); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs deleted file mode 100644 index bc813f7e14..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTestFixture.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveMethodFromUnknownImportAllTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("methodcall", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from unknown import *\r\n" + - "methodcall\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs deleted file mode 100644 index dab0f51a9b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTestFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveMethodWhenFromImportIsUnknownTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("methodcall", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from unknown import methodcall\r\n" + - "methodcall\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs deleted file mode 100644 index f1a5f8f5c8..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTestFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveMethodWhenImportIsUnknownTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("unknown.methodcall", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from unknown import methodcall\r\n" + - "unknown.methodcall\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs deleted file mode 100644 index 3eb00a2f00..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTestFixture.cs +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSysModuleExitMethodTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("sys.exit", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import sys\r\n" + - "sys.exit\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsExit() - { - Assert.AreEqual("exit", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - - [Test] - public void ResolveResultContainingTypeHasTwoExitMethods() - { - List exitMethods = GetExitMethods(); - Assert.AreEqual(2, exitMethods.Count); - } - - List GetExitMethods() - { - return GetExitMethods(-1); - } - - List GetExitMethods(int parameterCount) - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("exit", parameterCount, methods.ToArray()); - } - - [Test] - public void BothExitMethodsArePublic() - { - foreach (IMethod method in GetExitMethods()) { - Assert.IsTrue(method.IsPublic); - } - } - - [Test] - public void BothExitMethodsHaveClassWithNameOfSys() - { - foreach (IMethod method in GetExitMethods()) { - Assert.AreEqual("sys", method.DeclaringType.Name); - } - } - - [Test] - public void OneExitMethodHasOneParameter() - { - int parameterCount = 1; - Assert.AreEqual(1, GetExitMethods(parameterCount).Count); - } - - [Test] - public void ExitMethodParameterNameIsCode() - { - IParameter parameter = GetFirstExitMethodParameter(); - Assert.AreEqual("code", parameter.Name); - } - - IParameter GetFirstExitMethodParameter() - { - int parameterCount = 1; - List methods = GetExitMethods(parameterCount); - IMethod method = methods[0]; - return method.Parameters[0]; - } - - [Test] - public void ExitMethodParameterReturnTypeIsObject() - { - IParameter parameter = GetFirstExitMethodParameter(); - Assert.AreEqual("Object", parameter.ReturnType.Name); - } - - [Test] - public void ExitMethodParameterConvertedToStringUsingAmbienceReturnsObjectCodeString() - { - IAmbience ambience = new CSharpAmbience(); - string text = ambience.Convert(GetFirstExitMethodParameter()); - Assert.AreEqual("object code", text); - } - - [Test] - public void ExitMethodReturnTypeConvertedToStringUsingAmbienceReturnsVoid() - { - IAmbience ambience = new CSharpAmbience(); - List methods = GetExitMethods(); - IReturnType returnType = methods[0].ReturnType; - string text = ambience.Convert(returnType); - Assert.AreEqual("void", text); - } - - [Test] - public void MethodGroupContainingTypeHasTwoExitMethods() - { - IReturnType returnType = MethodResolveResult.ContainingType; - List methods = PythonCompletionItemsHelper.FindAllMethodsFromCollection("exit", returnType.GetMethods()); - Assert.AreEqual(2, methods.Count); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs deleted file mode 100644 index 39a380325b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTestFixture.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSysModuleImportedAsMySysTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("mysys", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import sys as mysys\r\n" + - "mysys\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultContainsExitMethod() - { - List items = GetCompletionItems(); - IMethod method = PythonCompletionItemsHelper.FindMethodFromCollection("exit", items); - Assert.IsNotNull(method); - } - - List GetCompletionItems() - { - return resolveResult.GetCompletionData(projectContent); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs deleted file mode 100644 index bbbf0fb67c..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTestFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSysModuleUnknownMethodTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("sys.unknown", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import sys\r\n" + - "sys.unknown\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsNull() - { - Assert.IsNull(resolveResult); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs deleted file mode 100644 index c91386fe69..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTestFixture.cs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests the PythonResolver correctly resolves the expression: - /// "System.Console" - /// - [TestFixture] - public class ResolveSystemConsoleTestFixture - { - PythonResolver resolver; - ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; - ResolveResult resolveResult; - MockClass testClass; - ICompilationUnit compilationUnit; - MockClass systemConsoleClass; - ResolveResult invalidMostRecentCompilationUnitResolveResult; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); - - systemConsoleClass = new MockClass(mockProjectContent, "System.Console"); - mockProjectContent.ClassToReturnFromGetClass = systemConsoleClass; - - compilationUnit = CreateCompilationUnit(mockProjectContent); - ParseInformation parseInfo = new ParseInformation(compilationUnit); - - string python = GetPythonScript(); - ExpressionResult expressionResult = new ExpressionResult("System.Console", new DomRegion(3, 2), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python); - - // Check that the best compilation unit is used and the resolve - // still works. - invalidMostRecentCompilationUnitResolveResult = resolver.Resolve(expressionResult, parseInfo, python); - } - - [Test] - public void ResolveResultExists() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void IsTypeResolveResult() - { - Assert.IsInstanceOf(typeof(TypeResolveResult), resolveResult); - } - - [Test] - public void ResolvedClass() - { - TypeResolveResult typeResolveResult = resolveResult as TypeResolveResult; - Assert.AreEqual(systemConsoleClass, typeResolveResult.ResolvedClass); - } - - [Test] - public void IsGetClassCalled() - { - Assert.IsTrue(mockProjectContent.GetClassCalled); - } - - [Test] - public void GetClassName() - { - Assert.AreEqual("System.Console", mockProjectContent.GetClassName); - } - - [Test] - public void ResolvedClassWithInvalidMostRecentCompilationUnit() - { - TypeResolveResult typeResolveResult = invalidMostRecentCompilationUnitResolveResult as TypeResolveResult; - Assert.AreEqual(systemConsoleClass, typeResolveResult.ResolvedClass); - } - - /// - /// Returns the Python script that will be used for testing. - /// - protected virtual string GetPythonScript() - { - return "import System\r\n" + - "class Test:\r\n" + - "\tdef __init__(self):\r\n" + - "\t\tSystem.Console\r\n"; - } - - /// - /// Creates a compilation unit with one class called Test. - /// - protected virtual ICompilationUnit CreateCompilationUnit(IProjectContent projectContent) - { - ICompilationUnit compilationUnit = new DefaultCompilationUnit(projectContent); - testClass = new MockClass(projectContent, "Test"); - compilationUnit.Classes.Add(testClass); - return compilationUnit; - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs deleted file mode 100644 index a08d5a5e4e..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTestFixture.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests that the PythonResolver resolves "import System" to - /// a namespace. - /// - [TestFixture] - public class ResolveSystemImportTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - string code = GetPythonScript(); - PythonExpressionFinder finder = new PythonExpressionFinder(); - return finder.FindExpression(code, code.Length); - } - - protected override string GetPythonScript() - { - return "import System"; - } - - [Test] - public void NamespaceResolveResultFound() - { - Assert.IsNotNull(resolveResult); - } - - [Test] - public void NamespaceName() - { - PythonImportModuleResolveResult importResolveResult = (PythonImportModuleResolveResult)resolveResult; - Assert.AreEqual("System", importResolveResult.Name); - } - - [Test] - public void ExpressionResultContextShowItemReturnsTrueForNamespaceEntry() - { - NamespaceEntry entry = new NamespaceEntry("abc"); - Assert.IsTrue(expressionResult.Context.ShowEntry(entry)); - } - - [Test] - public void ExpressionResultContextShowItemReturnsFalseForNull() - { - Assert.IsFalse(expressionResult.Context.ShowEntry(null)); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs deleted file mode 100644 index 4505c14895..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTestFixture.cs +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemImportedAsMySystemTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - List namespaceItems = new List(); - DefaultClass consoleClass = new DefaultClass(compilationUnit, "System.Console"); - namespaceItems.Add(consoleClass); - projectContent.AddExistingNamespaceContents("System", namespaceItems); - - return new ExpressionResult("MySystem", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "import System as MySystem\r\n" + - "MySystem.\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultContainsConsoleClass() - { - List items = GetCompletionItems(); - IClass consoleClass = PythonCompletionItemsHelper.FindClassFromCollection("Console", items); - Assert.IsNotNull(consoleClass); - } - - List GetCompletionItems() - { - return resolveResult.GetCompletionData(projectContent); - } - - [Test] - public void NamespaceResolveResultNameIsSystem() - { - NamespaceResolveResult namespaceResolveResult = resolveResult as NamespaceResolveResult; - Assert.AreEqual("System", namespaceResolveResult.Name); - } - - [Test] - public void MockProjectContentSystemNamespaceContentsIncludesConsoleClass() - { - List items = projectContent.GetNamespaceContents("System"); - IClass consoleClass = PythonCompletionItemsHelper.FindClassFromCollection("Console", items); - Assert.IsNotNull(consoleClass); - } - - [Test] - public void MockProjectContentNamespaceExistsReturnsTrueForSystem() - { - Assert.IsTrue(projectContent.NamespaceExists("System")); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs deleted file mode 100644 index 6b7c763035..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTestFixture.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests the PythonResolver correctly resolves the expression: - /// "System" - /// - [TestFixture] - public class ResolveSystemNamespaceTestFixture - { - PythonResolver resolver; - MockProjectContent mockProjectContent; - NamespaceResolveResult resolveResult; - - [TestFixtureSetUp] - public void SetUpFixture() - { - resolver = new PythonResolver(); - mockProjectContent = new MockProjectContent(); - mockProjectContent.AddExistingNamespaceContents("System", new List()); - - string python = - "import System\r\n" + - "class Test:\r\n" + - " def __init__(self):\r\n" + - " System.\r\n"; - - PythonParser parser = new PythonParser(); - string fileName = @"C:\Projects\Test\test.py"; - DefaultCompilationUnit cu = parser.Parse(mockProjectContent, fileName, python) as DefaultCompilationUnit; - cu.ErrorsDuringCompile = true; - ParseInformation parseInfo = new ParseInformation(cu); - - ExpressionResult expressionResult = new ExpressionResult("System", new DomRegion(4, 2), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as NamespaceResolveResult; - } - - [Test] - public void NamespaceExistsCalled() - { - Assert.IsTrue(mockProjectContent.NamespaceExistsCalled); - } - - [Test] - public void NamespaceSearchedFor() - { - Assert.AreEqual("System", mockProjectContent.NamespacePassedToNamespaceExistsMethod); - } - - [Test] - public void NamespaceResolveResultHasSystemNamespace() - { - Assert.AreEqual("System", resolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs deleted file mode 100644 index 91852d9b7b..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTestFixture.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemNamespaceWithMissingImportTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass systemConsoleClass = new MockClass(projectContent, "System.Console"); - List namespaceItems = new List(); - namespaceItems.Add(systemConsoleClass); - projectContent.AddExistingNamespaceContents("System", namespaceItems); - - return new ExpressionResult("System", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return "System\r\n"; - } - - [Test] - public void ResolveResultIsNullSinceSystemNamespaceIsNotImported() - { - Assert.IsNull(resolveResult); - } - - [Test] - public void ProjectContentNamespaceExistsReturnsTrueForSystemNamespace() - { - Assert.IsTrue(projectContent.NamespaceExists("System")); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs deleted file mode 100644 index cea9f30969..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTestFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemWindowsFormsWithImportSystemTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockProjectContent referencedContent = new MockProjectContent(); - List namespaceItems = new List(); - referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); - projectContent.ReferencedContents.Add(referencedContent); - - return new ExpressionResult("System.Windows.Forms"); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "System.Windows.Forms\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemNamespace() - { - Assert.AreEqual("System.Windows.Forms", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs deleted file mode 100644 index 993ea91ce2..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTestFixture.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemWindowsWithImportSystemTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockProjectContent referencedContent = new MockProjectContent(); - List namespaceItems = new List(); - referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); - projectContent.ReferencedContents.Add(referencedContent); - - return new ExpressionResult("System.Windows"); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "System.Windows\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemWindowsNamespace() - { - Assert.AreEqual("System.Windows", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs deleted file mode 100644 index 5287db4f5f..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTestFixture.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveSystemWithImportSystemWindowsTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("System"); - } - - protected override string GetPythonScript() - { - return - "import System.Windows\r\n" + - "System\r\n"; - } - - NamespaceResolveResult NamespaceResolveResult { - get { return resolveResult as NamespaceResolveResult; } - } - - [Test] - public void NamespaceResolveResultHasSystemNamespace() - { - Assert.AreEqual("System", NamespaceResolveResult.Name); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs deleted file mode 100644 index 8c7c9ed2c6..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTestFixture.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTanMethodFromMathImportAllTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("tan", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from sys import *\r\n" + - "from math import *\r\n" + - "from socket import *\r\n" + - "\r\n" + - "tan\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsTan() - { - Assert.AreEqual("tan", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - - [Test] - public void ResolveResultContainingTypeHasOneTanMethods() - { - List tanMethods = GetTanMethods(); - Assert.AreEqual(1, tanMethods.Count); - } - - List GetTanMethods() - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("tan", -1, methods.ToArray()); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs deleted file mode 100644 index 94c4332fdf..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTestFixture.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTanMethodFromMathImportCosAndTanTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - return new ExpressionResult("tan", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from math import cos, tan\r\n" + - "tan\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsMethodGroupResolveResult() - { - Assert.IsTrue(resolveResult is MethodGroupResolveResult); - } - - [Test] - public void ResolveResultMethodNameIsTan() - { - Assert.AreEqual("tan", MethodResolveResult.Name); - } - - MethodGroupResolveResult MethodResolveResult { - get { return (MethodGroupResolveResult)resolveResult; } - } - - [Test] - public void ResolveResultContainingTypeHasOneTanMethods() - { - List tanMethods = GetTanMethods(); - Assert.AreEqual(1, tanMethods.Count); - } - - List GetTanMethods() - { - List methods = MethodResolveResult.ContainingType.GetMethods(); - return PythonCompletionItemsHelper.FindAllMethodsFromCollection("tan", -1, methods.ToArray()); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs deleted file mode 100644 index 04f9734b39..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestFixtureBase.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.PythonBinding; -using ICSharpCode.Scripting.Tests.Utils; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - public abstract class ResolveTestFixtureBase - { - protected ICompilationUnit compilationUnit; - protected MockProjectContent projectContent; - protected PythonResolver resolver; - protected ResolveResult resolveResult; - protected ParseInformation parseInfo; - protected ExpressionResult expressionResult; - - [SetUp] - public void InitBase() - { - projectContent = new MockProjectContent(); - PythonParser parser = new PythonParser(); - string fileName = @"C:\projects\test\test.py"; - compilationUnit = parser.Parse(projectContent, fileName, GetPythonScript()); - parseInfo = new ParseInformation(compilationUnit); - - resolver = new PythonResolver(); - - expressionResult = GetExpressionResult(); - resolveResult = resolver.Resolve(expressionResult, parseInfo, GetPythonScript()); - } - - protected abstract ExpressionResult GetExpressionResult(); - - protected abstract string GetPythonScript(); - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs deleted file mode 100644 index 70c110a197..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTextBoxFromSystemWindowsFormsImportTextBoxTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); - projectContent.ClassToReturnFromGetClass = textBoxClass; - projectContent.ClassNameForGetClass = "System.Windows.Forms.TextBox"; - - return new ExpressionResult("TextBox", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from System.Windows.Forms import TextBox\r\n" + - "TextBox\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsTypeResolveResult() - { - Assert.IsTrue(resolveResult is TypeResolveResult); - } - - [Test] - public void ResolveResultResolveClassNameIsTextBox() - { - Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs deleted file mode 100644 index 61385237f1..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture.cs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Dom.CSharp; -using NUnit.Framework; -using PythonBinding.Tests.Utils; -using UnitTesting.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - [TestFixture] - public class ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); - projectContent.ClassToReturnFromGetClass = textBoxClass; - projectContent.ClassNameForGetClass = "System.Windows.Forms.TextBox"; - - return new ExpressionResult("MyTextBox", ExpressionContext.Default); - } - - protected override string GetPythonScript() - { - return - "from System.Windows.Forms import TextBox as MyTextBox\r\n" + - "MyTextBox\r\n" + - "\r\n"; - } - - [Test] - public void ResolveResultIsTypeResolveResult() - { - Assert.IsTrue(resolveResult is TypeResolveResult); - } - - [Test] - public void ResolveResultResolveClassNameIsTextBox() - { - Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); - } - - TypeResolveResult TypeResolveResult { - get { return (TypeResolveResult)resolveResult; } - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs deleted file mode 100644 index 2a5f7f3f49..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTestFixture.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections.Generic; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Tests the PythonResolver does not return a namespace resolve result for - /// an unknown namespace. - /// - [TestFixture] - public class ResolveUnknownNamespaceTestFixture : ResolveTestFixtureBase - { - protected override ExpressionResult GetExpressionResult() - { - projectContent.AddExistingNamespaceContents("System", new List()); - - return new ExpressionResult("Unknown", new DomRegion(3, 2), null, null); - } - - protected override string GetPythonScript() - { - return - "import System\r\n" + - "class Test:\r\n" + - " def __init__(self):\r\n" + - " Unknown\r\n"; - } - - [Test] - public void ResolveResultDoesNotExist() - { - Assert.IsNull(resolveResult); - } - } -} From e5d7bccdcaca880b00e2a59d8c5692a9d8220cc5 Mon Sep 17 00:00:00 2001 From: mrward Date: Wed, 22 Sep 2010 21:39:23 +0100 Subject: [PATCH 10/33] Add support for IronPython code completion on properties to any level. --- .../BackendBindings/Python/PythonBinding.sln | 2 +- .../Project/Src/PythonPropertyResolver.cs | 27 +++- ...paceContentsAddedToCtrlSpaceTestFixture.cs | 2 +- .../Test/PythonBinding.Tests.csproj | 58 ++++---- .../ResolveBuiltInRoundMethodTests.cs | 117 +++++++++++++++ .../Resolver/ResolveClassPropertyTests.cs | 78 +++++++--- .../Resolver/ResolveConsoleWriteLineTests.cs | 60 ++++++++ ...xitMethodFromSysImportExitAsMyExitTests.cs | 47 ++++++ ...eExitMethodFromSysImportExitTestFixture.cs | 2 +- ...lveFooWindowsWithImportSystemAsFooTests.cs | 45 ++++++ .../Test/Resolver/ResolveFromImportTests.cs | 54 +++++++ ...hImportedMathModuleCompletionItemsTests.cs | 55 +++++++ .../ResolveFromSystemImportEverythingTests.cs | 56 ++++++++ .../ResolveLocalClassInstanceTests.cs | 101 +++++++++++++ .../ResolveMethodFromUnknownImportAllTests.cs | 37 +++++ ...solveMethodWhenFromImportIsUnknownTests.cs | 36 +++++ .../ResolveMethodWhenImportIsUnknownTests.cs | 36 +++++ .../Test/Resolver/ResolveSelfTests.cs | 2 +- .../ResolveSysModuleExitMethodTests.cs | 136 ++++++++++++++++++ .../ResolveSysModuleImportedAsMySysTests.cs | 42 ++++++ .../Resolver/ResolveSysModuleTestFixture.cs | 2 +- .../ResolveSysModuleUnknownMethodTests.cs | 36 +++++ .../Resolver/ResolveSystemConsoleTests.cs | 105 ++++++++++++++ .../Test/Resolver/ResolveSystemImportTests.cs | 59 ++++++++ .../ResolveSystemImportedAsMySystemTests.cs | 68 +++++++++ .../Resolver/ResolveSystemNamespaceTests.cs | 66 +++++++++ ...veSystemNamespaceWithMissingImportTests.cs | 44 ++++++ ...SystemWindowsFormsWithImportSystemTests.cs | 45 ++++++ ...solveSystemWindowsWithImportSystemTests.cs | 45 ++++++ ...solveSystemWithImportSystemWindowsTests.cs | 39 +++++ .../ResolveTanMethodFromMathImportAllTests.cs | 63 ++++++++ ...veTanMethodFromMathImportCosAndTanTests.cs | 60 ++++++++ .../Test/Resolver/ResolveTestsBase.cs | 41 ++++++ ...romSystemWindowsFormsImportTextBoxTests.cs | 51 +++++++ ...romSystemWindowsFormsImportedAsFooTests.cs | 51 +++++++ ...temWindowsFormsImportedAsMyTextBoxTests.cs | 51 +++++++ .../Resolver/ResolveUnknownNamespaceTests.cs | 43 ++++++ .../Test/Utils/MockProjectContent.cs | 38 ++--- .../Utils/Tests/MockProjectContentTests.cs | 110 +++++++------- 39 files changed, 1873 insertions(+), 137 deletions(-) create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveBuiltInRoundMethodTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromSystemImportEverythingTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestsBase.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsFooTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTests.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding.sln b/src/AddIns/BackendBindings/Python/PythonBinding.sln index fb15eb87e0..7676dba062 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding.sln +++ b/src/AddIns/BackendBindings/Python/PythonBinding.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.6611 +# SharpDevelop 4.0.0.6676 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs index 7d4d93c20f..9900b4bcc2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs @@ -17,19 +17,21 @@ namespace ICSharpCode.PythonBinding public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) { - IProperty property = FindProperty(resolverContext, expressionResult); + IProperty property = FindProperty(resolverContext, expressionResult.Expression); if (property != null) { return CreateMemberResolveResult(property); } return null; } - IProperty FindProperty(PythonResolverContext resolverContext, ExpressionResult expressionResult) + IProperty FindProperty(PythonResolverContext resolverContext, string expression) { - MemberName memberName = new MemberName(expressionResult.Expression); + MemberName memberName = new MemberName(expression); IClass matchingClass = FindClass(resolverContext, memberName.Type); if (matchingClass != null) { - return FindProperty(matchingClass, memberName.Name); + return FindPropertyInClass(matchingClass, memberName.Name); + } else if (memberName.HasName) { + return FindProperty(resolverContext, memberName); } return null; } @@ -44,7 +46,7 @@ namespace ICSharpCode.PythonBinding return classResolver.GetClass(resolverContext, typeName); } - IProperty FindProperty(IClass matchingClass, string memberName) + IProperty FindPropertyInClass(IClass matchingClass, string memberName) { foreach (IProperty property in matchingClass.Properties) { if (property.Name == memberName) { @@ -53,5 +55,20 @@ namespace ICSharpCode.PythonBinding } return null; } + + IProperty FindProperty(PythonResolverContext resolverContext, MemberName memberName) + { + IProperty parentProperty = FindProperty(resolverContext, memberName.Type); + if (parentProperty != null) { + return FindPropertyInProperty(parentProperty, memberName.Name); + } + return null; + } + + IProperty FindPropertyInProperty(IProperty parentProperty, string propertyName) + { + IClass parentPropertyClass = parentProperty.ReturnType.GetUnderlyingClass(); + return FindPropertyInClass(parentPropertyClass, propertyName); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/NamespaceContentsAddedToCtrlSpaceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/NamespaceContentsAddedToCtrlSpaceTestFixture.cs index d9dbe58fe6..e230f1e49b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/NamespaceContentsAddedToCtrlSpaceTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Completion/NamespaceContentsAddedToCtrlSpaceTestFixture.cs @@ -36,7 +36,7 @@ namespace PythonBinding.Tests.Resolver namespaceItems.Add(myTestClass); mockProjectContent.AddExistingNamespaceContents("MyNamespace", namespaceItems); - DefaultCompilationUnit cu = new DefaultCompilationUnit(mockProjectContent) { ErrorsDuringCompile = true }; + DefaultCompilationUnit cu = new DefaultCompilationUnit(mockProjectContent); // Add usings. DefaultUsing newUsing = new DefaultUsing(cu.ProjectContent); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 4c49b36df8..45b300c7e4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -349,22 +349,21 @@ - + - - + + - - - - - + + + + - - - - + + + + @@ -374,26 +373,27 @@ - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveBuiltInRoundMethodTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveBuiltInRoundMethodTests.cs new file mode 100644 index 0000000000..b63f7e7d72 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveBuiltInRoundMethodTests.cs @@ -0,0 +1,117 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveBuiltInRoundMethodTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("round", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "round\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsMethodGroupResolveResult() + { + Assert.IsTrue(resolveResult is MethodGroupResolveResult); + } + + [Test] + public void ResolveResultMethodNameIsRound() + { + Assert.AreEqual("round", MethodResolveResult.Name); + } + + MethodGroupResolveResult MethodResolveResult { + get { return (MethodGroupResolveResult)resolveResult; } + } + + [Test] + public void ResolveResultContainingTypeHasTwoRoundMethods() + { + List exitMethods = GetRoundMethods(); + Assert.AreEqual(2, exitMethods.Count); + } + + List GetRoundMethods() + { + return GetRoundMethods(-1); + } + + List GetRoundMethods(int parameterCount) + { + List methods = MethodResolveResult.ContainingType.GetMethods(); + return PythonCompletionItemsHelper.FindAllMethodsFromCollection("round", parameterCount, methods.ToArray()); + } + + [Test] + public void BothRoundMethodsArePublic() + { + foreach (IMethod method in GetRoundMethods()) { + Assert.IsTrue(method.IsPublic); + } + } + + [Test] + public void BothRoundMethodsHaveClassWithNameOfSys() + { + foreach (IMethod method in GetRoundMethods()) { + Assert.AreEqual("__builtin__", method.DeclaringType.Name); + } + } + + [Test] + public void OneRoundMethodHasTwoParameters() + { + int parameterCount = 2; + Assert.AreEqual(1, GetRoundMethods(parameterCount).Count); + } + + [Test] + public void RoundMethodParameterNameIsNumber() + { + IParameter parameter = GetFirstRoundMethodParameter(); + Assert.AreEqual("number", parameter.Name); + } + + IParameter GetFirstRoundMethodParameter() + { + int parameterCount = 1; + List methods = GetRoundMethods(parameterCount); + IMethod method = methods[0]; + return method.Parameters[0]; + } + + [Test] + public void RoundMethodParameterReturnTypeIsDouble() + { + IParameter parameter = GetFirstRoundMethodParameter(); + Assert.AreEqual("Double", parameter.ReturnType.Name); + } + + [Test] + public void RoundMethodParameterConvertedToStringUsingAmbienceReturnsDoubleNumberString() + { + IAmbience ambience = new CSharpAmbience(); + string text = ambience.Convert(GetFirstRoundMethodParameter()); + Assert.AreEqual("double number", text); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs index 4524ba60bc..f7cc9c3de4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs @@ -15,53 +15,60 @@ namespace PythonBinding.Tests.Resolver { ResolveResult result; ParseInformation parseInfo; + ScriptingUtils.MockProjectContent projectContent; IProperty myClassProperty; MockClass myClass; + IProperty nestedClassProperty; - void ResolveClassProperty() + void ResolvePropertyExpression(string expression) { PythonResolverContext context = new PythonResolverContext(parseInfo); - ExpressionResult expression = new ExpressionResult("MyClass.MyProperty"); + ExpressionResult expressionResult = new ExpressionResult(expression); PythonResolver resolver = new PythonResolver(); - result = resolver.Resolve(context, expression); + result = resolver.Resolve(context, expressionResult); } - void CreateParseInfoWithOneClass() + void CreateParseInfoWithOneClassWithOneProperty() { - ScriptingUtils.MockProjectContent projectContent = new ScriptingUtils.MockProjectContent(); + projectContent = new ScriptingUtils.MockProjectContent(); myClass = new MockClass(projectContent, "MyClass"); - projectContent.ClassToReturnFromGetClass = myClass; - projectContent.ClassNameForGetClass = "MyClass"; - - myClassProperty = CreateProperty(myClass); - myClass.Properties.Add(myClassProperty); + myClassProperty = AddPropertyToClass("MyProperty", myClass); DefaultCompilationUnit unit = new DefaultCompilationUnit(projectContent); parseInfo = new ParseInformation(unit); + + projectContent.SetClassToReturnFromGetClass("MyClass", myClass); + } + + IProperty AddPropertyToClass(string propertyName, IClass c) + { + IProperty property = CreateProperty(propertyName, c); + c.Properties.Add(property); + return property; } - IProperty CreateProperty(IClass c) + IProperty CreateProperty(string propertyName, IClass c) { - return new DefaultProperty(c, "MyProperty"); + return new DefaultProperty(c, propertyName); } [Test] - public void Resolve_ClassHasOneProperty_ReturnsMemberResolveResult() + public void Resolve_ExpressionIsForPropertyOnClassWithOneProperty_ReturnsMemberResolveResult() { - CreateParseInfoWithOneClass(); - ResolveClassProperty(); + CreateParseInfoWithOneClassWithOneProperty(); + ResolvePropertyExpression("MyClass.MyProperty"); MemberResolveResult memberResolveResult = result as MemberResolveResult; Assert.IsNotNull(memberResolveResult); } [Test] - public void Resolve_ClassHasOneProperty_MemberResolveResultResolvedTypeIsMyClassProperty() + public void Resolve_ExpressionIsForPropertyOnClassWithOneProperty_MemberResolveResultResolvedTypeIsMyClassProperty() { - CreateParseInfoWithOneClass(); - ResolveClassProperty(); + CreateParseInfoWithOneClassWithOneProperty(); + ResolvePropertyExpression("MyClass.MyProperty"); MemberResolveResult memberResolveResult = result as MemberResolveResult; IMember resolvedMember = memberResolveResult.ResolvedMember; @@ -69,17 +76,42 @@ namespace PythonBinding.Tests.Resolver } [Test] - public void Resolve_ClassHasTwoProperties_MemberResolveResultResolvedTypeIsSecondClassProperty() + public void Resolve_ExpressionIsForSecondPropertyOnClassWithTwoProperties_MemberResolveResultResolvedTypeIsSecondClassProperty() { - CreateParseInfoWithOneClass(); - DefaultProperty extraProperty = new DefaultProperty(myClass, "ExtraProperty"); - myClass.Properties.Insert(0, extraProperty); - ResolveClassProperty(); + CreateParseInfoWithOneClassWithOneProperty(); + InsertNewPropertyOnClassBeforeExistingProperty(); + ResolvePropertyExpression("MyClass.MyProperty"); MemberResolveResult memberResolveResult = result as MemberResolveResult; IMember resolvedMember = memberResolveResult.ResolvedMember; Assert.AreEqual(myClassProperty, resolvedMember); } + + void InsertNewPropertyOnClassBeforeExistingProperty() + { + IProperty extraProperty = CreateProperty("ExtraProperty", myClass); + myClass.Properties.Insert(0, extraProperty); + } + + [Test] + public void Resolve_ExpressionRefersToNestedProperty_MemberResolveResultResolvedTypeIsNestedProperty() + { + CreateParseInfoWithOneClassWithOneProperty(); + AddNestedPropertyToExistingProperty(); + ResolvePropertyExpression("MyClass.MyProperty.MyNestedProperty"); + + MemberResolveResult memberResolveResult = result as MemberResolveResult; + IMember resolvedMember = memberResolveResult.ResolvedMember; + + Assert.AreEqual(nestedClassProperty, resolvedMember); + } + + void AddNestedPropertyToExistingProperty() + { + MockClass nestedPropertyClass = new MockClass(projectContent, "MyNestedPropertyClass"); + nestedClassProperty = AddPropertyToClass("MyNestedProperty", nestedPropertyClass); + myClassProperty.ReturnType = new DefaultReturnType(nestedPropertyClass); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTests.cs new file mode 100644 index 0000000000..ef116d3c5b --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveConsoleWriteLineTests.cs @@ -0,0 +1,60 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests that the expression "Console.WriteLine" is correctly + /// resolved. + /// + [TestFixture] + public class ResolveConsoleWriteLineTests : ResolveTestsBase + { + MockClass systemConsoleClass; + + protected override ExpressionResult GetExpressionResult() + { + systemConsoleClass = new MockClass(projectContent, "System.Console"); + projectContent.SetClassToReturnFromGetClass("Console", systemConsoleClass); + return new ExpressionResult("Console.WriteLine", new DomRegion(2, 2), null, null); + } + + protected override string GetPythonScript() + { + return + "import System\r\n" + + "Console.WriteLine\r\n"; + } + + [Test] + public void ResolveResultExists() + { + Assert.IsNotNull(resolveResult); + } + + /// + /// Gets the class name used in IProjectContent.GetClass call. + /// + [Test] + public void GetClassName() + { + Assert.AreEqual("Console", projectContent.GetClassName); + } + + [Test] + public void MethodNameResolveIsWriteLine() + { + MethodGroupResolveResult methodResolveResult = (MethodGroupResolveResult)resolveResult; + Assert.AreEqual("WriteLine", methodResolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTests.cs new file mode 100644 index 0000000000..fb02caa42c --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitAsMyExitTests.cs @@ -0,0 +1,47 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveExitMethodFromSysImportExitAsMyExitTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("myexit", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from sys import exit as myexit\r\n" + + "myexit\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsMethodGroupResolveResult() + { + Assert.IsTrue(resolveResult is MethodGroupResolveResult); + } + + [Test] + public void ResolveResultMethodNameIsExit() + { + Assert.AreEqual("exit", MethodResolveResult.Name); + } + + MethodGroupResolveResult MethodResolveResult { + get { return (MethodGroupResolveResult)resolveResult; } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitTestFixture.cs index 12a5615c07..3b2c7d84d2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveExitMethodFromSysImportExitTestFixture.cs @@ -13,7 +13,7 @@ using PythonBinding.Tests.Utils; namespace PythonBinding.Tests.Resolver { [TestFixture] - public class ResolveExitMethodFromSysImportExitTestFixture : ResolveTestFixtureBase + public class ResolveExitMethodFromSysImportExitTestFixture : ResolveTestsBase { protected override ExpressionResult GetExpressionResult() { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTests.cs new file mode 100644 index 0000000000..2fb77b6da1 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFooWindowsWithImportSystemAsFooTests.cs @@ -0,0 +1,45 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveFooWindowsWithImportSystemAsFooTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockProjectContent referencedContent = new MockProjectContent(); + List namespaceItems = new List(); + referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); + projectContent.ReferencedContents.Add(referencedContent); + + return new ExpressionResult("Foo.Windows"); + } + + protected override string GetPythonScript() + { + return + "import System as Foo\r\n" + + "Foo.Windows\r\n"; + } + + NamespaceResolveResult NamespaceResolveResult { + get { return resolveResult as NamespaceResolveResult; } + } + + [Test] + public void NamespaceResolveResultHasSystemWindowsNamespace() + { + Assert.AreEqual("System.Windows", NamespaceResolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTests.cs new file mode 100644 index 0000000000..8da8066b20 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromImportTests.cs @@ -0,0 +1,54 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests that the PythonResolver resolves "from System" to + /// a namespace. + /// + [TestFixture] + public class ResolveFromImportTestFixture + { + PythonResolver resolver; + MockProjectContent mockProjectContent; + PythonImportModuleResolveResult resolveResult; + + [TestFixtureSetUp] + public void SetUpFixture() + { + resolver = new PythonResolver(); + + mockProjectContent = new MockProjectContent(); + DefaultCompilationUnit cu = new DefaultCompilationUnit(mockProjectContent); + cu.FileName = @"C:\Projects\Test\test.py"; + ParseInformation parseInfo = new ParseInformation(cu); + + string python = "from System"; + PythonExpressionFinder finder = new PythonExpressionFinder(); + ExpressionResult expressionResult = finder.FindExpression(python, python.Length); + resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as PythonImportModuleResolveResult; + } + + [Test] + public void NamespaceResolveResultFound() + { + Assert.IsNotNull(resolveResult); + } + + [Test] + public void NamespaceName() + { + Assert.AreEqual("System", resolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTests.cs new file mode 100644 index 0000000000..22c71efd40 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromMathImportedMathModuleCompletionItemsTests.cs @@ -0,0 +1,55 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; + +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveFromMathImportedMathModuleCompletionItemsTestFixture : ResolveTestsBase + { + List GetCompletionResults() + { + return resolveResult.GetCompletionData(projectContent); + } + + protected override ExpressionResult GetExpressionResult() + { + string code = GetPythonScript(); + PythonExpressionFinder finder = new PythonExpressionFinder(); + return finder.FindExpression(code, code.Length); + } + + protected override string GetPythonScript() + { + return "from math import"; + } + + [Test] + public void CompletionResultsContainCosMethodFromMathModule() + { + IMethod method = PythonCompletionItemsHelper.FindMethodFromCollection("cos", GetCompletionResults()); + Assert.IsNotNull(method); + } + + [Test] + public void ExpressionResultContextShowItemReturnsTrueForIMethod() + { + MockProjectContent projectContent = new MockProjectContent(); + DefaultCompilationUnit unit = new DefaultCompilationUnit(projectContent); + DefaultClass c = new DefaultClass(unit, "MyClass"); + DefaultMethod method = new DefaultMethod(c, "Test"); + + Assert.IsTrue(expressionResult.Context.ShowEntry(method)); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromSystemImportEverythingTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromSystemImportEverythingTests.cs new file mode 100644 index 0000000000..83914ef3ba --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveFromSystemImportEverythingTests.cs @@ -0,0 +1,56 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveFromSystemImportEverythingTests : ResolveTestsBase + { + MockClass consoleClass; + + protected override ExpressionResult GetExpressionResult() + { + consoleClass = new MockClass(projectContent, "System.Console"); + projectContent.SetClassToReturnFromGetClass("System.Console", consoleClass); + + List namespaceItems = new List(); + projectContent.AddExistingNamespaceContents("System", namespaceItems); + + return new ExpressionResult("Console", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from System import *\r\n" + + "Console\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultResolvedClassIsConsoleClass() + { + Assert.AreEqual(consoleClass, TypeResolveResult.ResolvedClass); + } + + TypeResolveResult TypeResolveResult { + get { return (TypeResolveResult)resolveResult; } + } + + [Test] + public void ProjectContentNamespaceExistsReturnsTrueForSystem() + { + Assert.IsTrue(projectContent.NamespaceExists("System")); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs new file mode 100644 index 0000000000..3f5a115f94 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs @@ -0,0 +1,101 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Given code: + /// + /// a = Class1() + /// + /// Check that the type of "a" can be obtained by the resolver. + /// + [TestFixture] + [Ignore("Disabled local variable resolution for SD 3.0")] + public class ResolveLocalClassInstanceTests + { + PythonResolver resolver; + ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; + LocalResolveResult resolveResult; + MockClass testClass; + ICompilationUnit compilationUnit; + + [TestFixtureSetUp] + public void SetUpFixture() + { + resolver = new PythonResolver(); + + mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); + testClass = new MockClass(mockProjectContent, "Test.Test1"); + mockProjectContent.ClassesInProjectContent.Add(testClass); + mockProjectContent.SetClassToReturnFromGetClass("Test.Test1", testClass); + + compilationUnit = new DefaultCompilationUnit(mockProjectContent); + compilationUnit.FileName = @"C:\Projects\Test\test.py"; + ParseInformation parseInfo = new ParseInformation(compilationUnit); + + string python = + "a = Test1()\r\n" + + "a"; + ExpressionResult expressionResult = new ExpressionResult("a", new DomRegion(2, 1), null, null); + resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as LocalResolveResult; + } + + [Test] + public void GetTypeOfInstance() + { + string code = "a = Class1()"; + PythonVariableResolver resolver = new PythonVariableResolver(); + Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); + } + + /// + /// Tests that the NameExpression in the resolver is reset so the second assignment + /// does not override the first. + /// + [Test] + public void DifferentTypeCreatedLast() + { + string code = "a = Class1()\r\n" + + "b = Class2()"; + PythonVariableResolver resolver = new PythonVariableResolver(); + Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); + } + + [Test] + public void StringAssignmentShouldNotResolve() + { + string code = "a = \"test\""; + PythonVariableResolver resolver = new PythonVariableResolver(); + Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); + } + + [Test] + public void NullCodeShouldNotResolve() + { + PythonVariableResolver resolver = new PythonVariableResolver(); + Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", null)); + } + + [Test] + public void ResolveResultIsLocalResolveResult() + { + Assert.IsNotNull(resolveResult); + } + + [Test] + public void ResolveResultVariableName() + { + Assert.AreEqual(resolveResult.VariableName, "a"); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTests.cs new file mode 100644 index 0000000000..84f4d94562 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodFromUnknownImportAllTests.cs @@ -0,0 +1,37 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveMethodFromUnknownImportAllTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("methodcall", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from unknown import *\r\n" + + "methodcall\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsNull() + { + Assert.IsNull(resolveResult); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTests.cs new file mode 100644 index 0000000000..f516e6aad2 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenFromImportIsUnknownTests.cs @@ -0,0 +1,36 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveMethodWhenFromImportIsUnknownTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("methodcall", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from unknown import methodcall\r\n" + + "methodcall\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsNull() + { + Assert.IsNull(resolveResult); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTests.cs new file mode 100644 index 0000000000..318bd614ee --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveMethodWhenImportIsUnknownTests.cs @@ -0,0 +1,36 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveMethodWhenImportIsUnknownTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("unknown.methodcall", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from unknown import methodcall\r\n" + + "unknown.methodcall\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsNull() + { + Assert.IsNull(resolveResult); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs index d49716f4bd..faf47d545f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs @@ -9,7 +9,7 @@ using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.Resolver { [TestFixture] - public class ResolveSelfTests : ResolveTestFixtureBase + public class ResolveSelfTests : ResolveTestsBase { IClass fooClass; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTests.cs new file mode 100644 index 0000000000..bee6c2dc42 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleExitMethodTests.cs @@ -0,0 +1,136 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSysModuleExitMethodTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("sys.exit", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "import sys\r\n" + + "sys.exit\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsMethodGroupResolveResult() + { + Assert.IsTrue(resolveResult is MethodGroupResolveResult); + } + + [Test] + public void ResolveResultMethodNameIsExit() + { + Assert.AreEqual("exit", MethodResolveResult.Name); + } + + MethodGroupResolveResult MethodResolveResult { + get { return (MethodGroupResolveResult)resolveResult; } + } + + [Test] + public void ResolveResultContainingTypeHasTwoExitMethods() + { + List exitMethods = GetExitMethods(); + Assert.AreEqual(2, exitMethods.Count); + } + + List GetExitMethods() + { + return GetExitMethods(-1); + } + + List GetExitMethods(int parameterCount) + { + List methods = MethodResolveResult.ContainingType.GetMethods(); + return PythonCompletionItemsHelper.FindAllMethodsFromCollection("exit", parameterCount, methods.ToArray()); + } + + [Test] + public void BothExitMethodsArePublic() + { + foreach (IMethod method in GetExitMethods()) { + Assert.IsTrue(method.IsPublic); + } + } + + [Test] + public void BothExitMethodsHaveClassWithNameOfSys() + { + foreach (IMethod method in GetExitMethods()) { + Assert.AreEqual("sys", method.DeclaringType.Name); + } + } + + [Test] + public void OneExitMethodHasOneParameter() + { + int parameterCount = 1; + Assert.AreEqual(1, GetExitMethods(parameterCount).Count); + } + + [Test] + public void ExitMethodParameterNameIsCode() + { + IParameter parameter = GetFirstExitMethodParameter(); + Assert.AreEqual("code", parameter.Name); + } + + IParameter GetFirstExitMethodParameter() + { + int parameterCount = 1; + List methods = GetExitMethods(parameterCount); + IMethod method = methods[0]; + return method.Parameters[0]; + } + + [Test] + public void ExitMethodParameterReturnTypeIsObject() + { + IParameter parameter = GetFirstExitMethodParameter(); + Assert.AreEqual("Object", parameter.ReturnType.Name); + } + + [Test] + public void ExitMethodParameterConvertedToStringUsingAmbienceReturnsObjectCodeString() + { + IAmbience ambience = new CSharpAmbience(); + string text = ambience.Convert(GetFirstExitMethodParameter()); + Assert.AreEqual("object code", text); + } + + [Test] + public void ExitMethodReturnTypeConvertedToStringUsingAmbienceReturnsVoid() + { + IAmbience ambience = new CSharpAmbience(); + List methods = GetExitMethods(); + IReturnType returnType = methods[0].ReturnType; + string text = ambience.Convert(returnType); + Assert.AreEqual("void", text); + } + + [Test] + public void MethodGroupContainingTypeHasTwoExitMethods() + { + IReturnType returnType = MethodResolveResult.ContainingType; + List methods = PythonCompletionItemsHelper.FindAllMethodsFromCollection("exit", returnType.GetMethods()); + Assert.AreEqual(2, methods.Count); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTests.cs new file mode 100644 index 0000000000..a4433f0a6c --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleImportedAsMySysTests.cs @@ -0,0 +1,42 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSysModuleImportedAsMySysTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("mysys", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "import sys as mysys\r\n" + + "mysys\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultContainsExitMethod() + { + List items = GetCompletionItems(); + IMethod method = PythonCompletionItemsHelper.FindMethodFromCollection("exit", items); + Assert.IsNotNull(method); + } + + List GetCompletionItems() + { + return resolveResult.GetCompletionData(projectContent); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleTestFixture.cs index 16270ad8db..74d1627bf0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleTestFixture.cs @@ -11,7 +11,7 @@ using PythonBinding.Tests.Utils; namespace PythonBinding.Tests.Resolver { [TestFixture] - public class ResolveSysModuleTestFixture : ResolveTestFixtureBase + public class ResolveSysModuleTestFixture : ResolveTestsBase { protected override ExpressionResult GetExpressionResult() { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTests.cs new file mode 100644 index 0000000000..e11708f5dc --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSysModuleUnknownMethodTests.cs @@ -0,0 +1,36 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSysModuleUnknownMethodTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("sys.unknown", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "import sys\r\n" + + "sys.unknown\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsNull() + { + Assert.IsNull(resolveResult); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs new file mode 100644 index 0000000000..ca2f758605 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs @@ -0,0 +1,105 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests the PythonResolver correctly resolves the expression: + /// "System.Console" + /// + [TestFixture] + public class ResolveSystemConsoleTestFixture + { + PythonResolver resolver; + ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; + ResolveResult resolveResult; + MockClass testClass; + ICompilationUnit compilationUnit; + MockClass systemConsoleClass; + ResolveResult invalidMostRecentCompilationUnitResolveResult; + + [TestFixtureSetUp] + public void SetUpFixture() + { + resolver = new PythonResolver(); + mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); + + systemConsoleClass = new MockClass(mockProjectContent, "System.Console"); + mockProjectContent.ClassToReturnFromGetClass = systemConsoleClass; + + compilationUnit = CreateCompilationUnit(mockProjectContent); + ParseInformation parseInfo = new ParseInformation(compilationUnit); + + string python = GetPythonScript(); + ExpressionResult expressionResult = new ExpressionResult("System.Console", new DomRegion(3, 2), null, null); + resolveResult = resolver.Resolve(expressionResult, parseInfo, python); + + // Check that the best compilation unit is used and the resolve + // still works. + invalidMostRecentCompilationUnitResolveResult = resolver.Resolve(expressionResult, parseInfo, python); + } + + [Test] + public void ResolveResultExists() + { + Assert.IsNotNull(resolveResult); + } + + [Test] + public void IsTypeResolveResult() + { + Assert.IsInstanceOf(typeof(TypeResolveResult), resolveResult); + } + + [Test] + public void ResolvedClass() + { + TypeResolveResult typeResolveResult = resolveResult as TypeResolveResult; + Assert.AreEqual(systemConsoleClass, typeResolveResult.ResolvedClass); + } + + [Test] + public void GetClassName() + { + Assert.AreEqual("System.Console", mockProjectContent.GetClassName); + } + + [Test] + public void ResolvedClassWithInvalidMostRecentCompilationUnit() + { + TypeResolveResult typeResolveResult = invalidMostRecentCompilationUnitResolveResult as TypeResolveResult; + Assert.AreEqual(systemConsoleClass, typeResolveResult.ResolvedClass); + } + + /// + /// Returns the Python script that will be used for testing. + /// + protected virtual string GetPythonScript() + { + return "import System\r\n" + + "class Test:\r\n" + + "\tdef __init__(self):\r\n" + + "\t\tSystem.Console\r\n"; + } + + /// + /// Creates a compilation unit with one class called Test. + /// + protected virtual ICompilationUnit CreateCompilationUnit(IProjectContent projectContent) + { + ICompilationUnit compilationUnit = new DefaultCompilationUnit(projectContent); + testClass = new MockClass(projectContent, "Test"); + compilationUnit.Classes.Add(testClass); + return compilationUnit; + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTests.cs new file mode 100644 index 0000000000..ab9763978c --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportTests.cs @@ -0,0 +1,59 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests that the PythonResolver resolves "import System" to + /// a namespace. + /// + [TestFixture] + public class ResolveSystemImportTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + string code = GetPythonScript(); + PythonExpressionFinder finder = new PythonExpressionFinder(); + return finder.FindExpression(code, code.Length); + } + + protected override string GetPythonScript() + { + return "import System"; + } + + [Test] + public void NamespaceResolveResultFound() + { + Assert.IsNotNull(resolveResult); + } + + [Test] + public void NamespaceName() + { + PythonImportModuleResolveResult importResolveResult = (PythonImportModuleResolveResult)resolveResult; + Assert.AreEqual("System", importResolveResult.Name); + } + + [Test] + public void ExpressionResultContextShowItemReturnsTrueForNamespaceEntry() + { + NamespaceEntry entry = new NamespaceEntry("abc"); + Assert.IsTrue(expressionResult.Context.ShowEntry(entry)); + } + + [Test] + public void ExpressionResultContextShowItemReturnsFalseForNull() + { + Assert.IsFalse(expressionResult.Context.ShowEntry(null)); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTests.cs new file mode 100644 index 0000000000..ddf060fe6a --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemImportedAsMySystemTests.cs @@ -0,0 +1,68 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSystemImportedAsMySystemTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + List namespaceItems = new List(); + DefaultClass consoleClass = new DefaultClass(compilationUnit, "System.Console"); + namespaceItems.Add(consoleClass); + projectContent.AddExistingNamespaceContents("System", namespaceItems); + + return new ExpressionResult("MySystem", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "import System as MySystem\r\n" + + "MySystem.\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultContainsConsoleClass() + { + List items = GetCompletionItems(); + IClass consoleClass = PythonCompletionItemsHelper.FindClassFromCollection("Console", items); + Assert.IsNotNull(consoleClass); + } + + List GetCompletionItems() + { + return resolveResult.GetCompletionData(projectContent); + } + + [Test] + public void NamespaceResolveResultNameIsSystem() + { + NamespaceResolveResult namespaceResolveResult = resolveResult as NamespaceResolveResult; + Assert.AreEqual("System", namespaceResolveResult.Name); + } + + [Test] + public void MockProjectContentSystemNamespaceContentsIncludesConsoleClass() + { + List items = projectContent.GetNamespaceContents("System"); + IClass consoleClass = PythonCompletionItemsHelper.FindClassFromCollection("Console", items); + Assert.IsNotNull(consoleClass); + } + + [Test] + public void MockProjectContentNamespaceExistsReturnsTrueForSystem() + { + Assert.IsTrue(projectContent.NamespaceExists("System")); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTests.cs new file mode 100644 index 0000000000..4839b50539 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceTests.cs @@ -0,0 +1,66 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests the PythonResolver correctly resolves the expression: + /// "System" + /// + [TestFixture] + public class ResolveSystemNamespaceTestFixture + { + PythonResolver resolver; + MockProjectContent mockProjectContent; + NamespaceResolveResult resolveResult; + + [TestFixtureSetUp] + public void SetUpFixture() + { + resolver = new PythonResolver(); + mockProjectContent = new MockProjectContent(); + mockProjectContent.AddExistingNamespaceContents("System", new List()); + + string python = + "import System\r\n" + + "class Test:\r\n" + + " def __init__(self):\r\n" + + " System.\r\n"; + + PythonParser parser = new PythonParser(); + string fileName = @"C:\Projects\Test\test.py"; + DefaultCompilationUnit cu = parser.Parse(mockProjectContent, fileName, python) as DefaultCompilationUnit; + ParseInformation parseInfo = new ParseInformation(cu); + + ExpressionResult expressionResult = new ExpressionResult("System", new DomRegion(4, 2), null, null); + resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as NamespaceResolveResult; + } + + [Test] + public void NamespaceExistsCalled() + { + Assert.IsTrue(mockProjectContent.NamespaceExistsCalled); + } + + [Test] + public void NamespaceSearchedFor() + { + Assert.AreEqual("System", mockProjectContent.NamespacePassedToNamespaceExistsMethod); + } + + [Test] + public void NamespaceResolveResultHasSystemNamespace() + { + Assert.AreEqual("System", resolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTests.cs new file mode 100644 index 0000000000..fdbf46a106 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemNamespaceWithMissingImportTests.cs @@ -0,0 +1,44 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSystemNamespaceWithMissingImportTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockClass systemConsoleClass = new MockClass(projectContent, "System.Console"); + List namespaceItems = new List(); + namespaceItems.Add(systemConsoleClass); + projectContent.AddExistingNamespaceContents("System", namespaceItems); + + return new ExpressionResult("System", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return "System\r\n"; + } + + [Test] + public void ResolveResultIsNullSinceSystemNamespaceIsNotImported() + { + Assert.IsNull(resolveResult); + } + + [Test] + public void ProjectContentNamespaceExistsReturnsTrueForSystemNamespace() + { + Assert.IsTrue(projectContent.NamespaceExists("System")); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTests.cs new file mode 100644 index 0000000000..61370450bb --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsFormsWithImportSystemTests.cs @@ -0,0 +1,45 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSystemWindowsFormsWithImportSystemTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockProjectContent referencedContent = new MockProjectContent(); + List namespaceItems = new List(); + referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); + projectContent.ReferencedContents.Add(referencedContent); + + return new ExpressionResult("System.Windows.Forms"); + } + + protected override string GetPythonScript() + { + return + "import System\r\n" + + "System.Windows.Forms\r\n"; + } + + NamespaceResolveResult NamespaceResolveResult { + get { return resolveResult as NamespaceResolveResult; } + } + + [Test] + public void NamespaceResolveResultHasSystemNamespace() + { + Assert.AreEqual("System.Windows.Forms", NamespaceResolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTests.cs new file mode 100644 index 0000000000..243834c576 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWindowsWithImportSystemTests.cs @@ -0,0 +1,45 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSystemWindowsWithImportSystemTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockProjectContent referencedContent = new MockProjectContent(); + List namespaceItems = new List(); + referencedContent.AddExistingNamespaceContents("System.Windows.Forms", namespaceItems); + projectContent.ReferencedContents.Add(referencedContent); + + return new ExpressionResult("System.Windows"); + } + + protected override string GetPythonScript() + { + return + "import System\r\n" + + "System.Windows\r\n"; + } + + NamespaceResolveResult NamespaceResolveResult { + get { return resolveResult as NamespaceResolveResult; } + } + + [Test] + public void NamespaceResolveResultHasSystemWindowsNamespace() + { + Assert.AreEqual("System.Windows", NamespaceResolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTests.cs new file mode 100644 index 0000000000..afb599f2af --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemWithImportSystemWindowsTests.cs @@ -0,0 +1,39 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveSystemWithImportSystemWindowsTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("System"); + } + + protected override string GetPythonScript() + { + return + "import System.Windows\r\n" + + "System\r\n"; + } + + NamespaceResolveResult NamespaceResolveResult { + get { return resolveResult as NamespaceResolveResult; } + } + + [Test] + public void NamespaceResolveResultHasSystemNamespace() + { + Assert.AreEqual("System", NamespaceResolveResult.Name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTests.cs new file mode 100644 index 0000000000..30f21bd74b --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportAllTests.cs @@ -0,0 +1,63 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveTanMethodFromMathImportAllTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("tan", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from sys import *\r\n" + + "from math import *\r\n" + + "from socket import *\r\n" + + "\r\n" + + "tan\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsMethodGroupResolveResult() + { + Assert.IsTrue(resolveResult is MethodGroupResolveResult); + } + + [Test] + public void ResolveResultMethodNameIsTan() + { + Assert.AreEqual("tan", MethodResolveResult.Name); + } + + MethodGroupResolveResult MethodResolveResult { + get { return (MethodGroupResolveResult)resolveResult; } + } + + [Test] + public void ResolveResultContainingTypeHasOneTanMethods() + { + List tanMethods = GetTanMethods(); + Assert.AreEqual(1, tanMethods.Count); + } + + List GetTanMethods() + { + List methods = MethodResolveResult.ContainingType.GetMethods(); + return PythonCompletionItemsHelper.FindAllMethodsFromCollection("tan", -1, methods.ToArray()); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTests.cs new file mode 100644 index 0000000000..6e3c9493d6 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTanMethodFromMathImportCosAndTanTests.cs @@ -0,0 +1,60 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveTanMethodFromMathImportCosAndTanTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + return new ExpressionResult("tan", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from math import cos, tan\r\n" + + "tan\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsMethodGroupResolveResult() + { + Assert.IsTrue(resolveResult is MethodGroupResolveResult); + } + + [Test] + public void ResolveResultMethodNameIsTan() + { + Assert.AreEqual("tan", MethodResolveResult.Name); + } + + MethodGroupResolveResult MethodResolveResult { + get { return (MethodGroupResolveResult)resolveResult; } + } + + [Test] + public void ResolveResultContainingTypeHasOneTanMethods() + { + List tanMethods = GetTanMethods(); + Assert.AreEqual(1, tanMethods.Count); + } + + List GetTanMethods() + { + List methods = MethodResolveResult.ContainingType.GetMethods(); + return PythonCompletionItemsHelper.FindAllMethodsFromCollection("tan", -1, methods.ToArray()); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestsBase.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestsBase.cs new file mode 100644 index 0000000000..02b610e59b --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTestsBase.cs @@ -0,0 +1,41 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.PythonBinding; +using ICSharpCode.Scripting.Tests.Utils; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + public abstract class ResolveTestsBase + { + protected ICompilationUnit compilationUnit; + protected MockProjectContent projectContent; + protected PythonResolver resolver; + protected ResolveResult resolveResult; + protected ParseInformation parseInfo; + protected ExpressionResult expressionResult; + + [SetUp] + public void InitBase() + { + projectContent = new MockProjectContent(); + PythonParser parser = new PythonParser(); + string fileName = @"C:\projects\test\test.py"; + compilationUnit = parser.Parse(projectContent, fileName, GetPythonScript()); + parseInfo = new ParseInformation(compilationUnit); + + resolver = new PythonResolver(); + + expressionResult = GetExpressionResult(); + resolveResult = resolver.Resolve(expressionResult, parseInfo, GetPythonScript()); + } + + protected abstract ExpressionResult GetExpressionResult(); + + protected abstract string GetPythonScript(); + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTests.cs new file mode 100644 index 0000000000..8473accf28 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportTextBoxTests.cs @@ -0,0 +1,51 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveTextBoxFromSystemWindowsFormsImportTextBoxTests : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); + projectContent.SetClassToReturnFromGetClass("System.Windows.Forms.TextBox", textBoxClass); + + return new ExpressionResult("TextBox", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from System.Windows.Forms import TextBox\r\n" + + "TextBox\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsTypeResolveResult() + { + Assert.IsTrue(resolveResult is TypeResolveResult); + } + + [Test] + public void ResolveResultResolveClassNameIsTextBox() + { + Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); + } + + TypeResolveResult TypeResolveResult { + get { return (TypeResolveResult)resolveResult; } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsFooTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsFooTests.cs new file mode 100644 index 0000000000..97de48bb17 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsFooTests.cs @@ -0,0 +1,51 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveTextBoxFromSystemWindowsFormsImportedAsFooTests : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); + projectContent.SetClassToReturnFromGetClass("System.Windows.Forms.TextBox", textBoxClass); + + return new ExpressionResult("Foo.TextBox", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "import System.Windows.Forms as Foo\r\n" + + "Foo.TextBox\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsTypeResolveResult() + { + Assert.IsTrue(resolveResult is TypeResolveResult); + } + + [Test] + public void ResolveResultResolveClassNameIsTextBox() + { + Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); + } + + TypeResolveResult TypeResolveResult { + get { return (TypeResolveResult)resolveResult; } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTests.cs new file mode 100644 index 0000000000..4f12aaa48a --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTests.cs @@ -0,0 +1,51 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Dom.CSharp; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class ResolveTextBoxFromSystemWindowsFormsImportedAsMyTextBoxTests : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + MockClass textBoxClass = new MockClass(projectContent, "System.Windows.Forms.TextBox"); + projectContent.SetClassToReturnFromGetClass("System.Windows.Forms.TextBox", textBoxClass); + + return new ExpressionResult("MyTextBox", ExpressionContext.Default); + } + + protected override string GetPythonScript() + { + return + "from System.Windows.Forms import TextBox as MyTextBox\r\n" + + "MyTextBox\r\n" + + "\r\n"; + } + + [Test] + public void ResolveResultIsTypeResolveResult() + { + Assert.IsTrue(resolveResult is TypeResolveResult); + } + + [Test] + public void ResolveResultResolveClassNameIsTextBox() + { + Assert.AreEqual("TextBox", TypeResolveResult.ResolvedClass.Name); + } + + TypeResolveResult TypeResolveResult { + get { return (TypeResolveResult)resolveResult; } + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTests.cs new file mode 100644 index 0000000000..bcbfb84a71 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveUnknownNamespaceTests.cs @@ -0,0 +1,43 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests; +using PythonBinding.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests the PythonResolver does not return a namespace resolve result for + /// an unknown namespace. + /// + [TestFixture] + public class ResolveUnknownNamespaceTestFixture : ResolveTestsBase + { + protected override ExpressionResult GetExpressionResult() + { + projectContent.AddExistingNamespaceContents("System", new List()); + + return new ExpressionResult("Unknown", new DomRegion(3, 2), null, null); + } + + protected override string GetPythonScript() + { + return + "import System\r\n" + + "class Test:\r\n" + + " def __init__(self):\r\n" + + " Unknown\r\n"; + } + + [Test] + public void ResolveResultDoesNotExist() + { + Assert.IsNull(resolveResult); + } + } +} diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs index 163be0bddd..b2d887860a 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs @@ -16,7 +16,6 @@ namespace ICSharpCode.Scripting.Tests.Utils bool searchTypeCalled; SearchTypeRequest searchTypeRequest; IClass classToReturnFromGetClass; - bool getClassCalled; string getClassName; List classesInProjectContent = new List(); string namespacePassedToGetNamespaceContentsMethod; @@ -26,10 +25,6 @@ namespace ICSharpCode.Scripting.Tests.Utils Dictionary> namespaceContents = new Dictionary>(); LanguageProperties language = LanguageProperties.CSharp; List referencedContents = new List(); - - public MockProjectContent() - { - } /// /// Gets the namespaces that will be added when the @@ -91,12 +86,11 @@ namespace ICSharpCode.Scripting.Tests.Utils get { return classNameForGetClass; } set { classNameForGetClass = value; } } - - /// - /// Gets whether the GetClass method was called. - /// - public bool GetClassCalled { - get { return getClassCalled; } + + public void SetClassToReturnFromGetClass(string className, IClass classToReturn) + { + ClassToReturnFromGetClass = classToReturn; + ClassNameForGetClass = className; } /// @@ -187,7 +181,6 @@ namespace ICSharpCode.Scripting.Tests.Utils public IClass GetClass(string typeName, int typeParameterCount) { getClassName = typeName; - getClassCalled = true; // If a class name is specified then only return a class // if we have a match. @@ -258,9 +251,6 @@ namespace ICSharpCode.Scripting.Tests.Utils public string SearchNamespace(string name, IClass curType, ICompilationUnit unit, int caretLine, int caretColumn) { -// searchNamespaceCalled = true; -// namespaceSearchedFor = name; -// return searchNamespace; throw new NotImplementedException(); } @@ -290,21 +280,13 @@ namespace ICSharpCode.Scripting.Tests.Utils { throw new NotImplementedException(); } - #endregion - - protected virtual void OnReferencedContentsChanged(EventArgs e) - { - if (ReferencedContentsChanged != null) { - ReferencedContentsChanged(this, e); - } - } public bool InternalsVisibleTo(IProjectContent otherProjectContent) { throw new NotImplementedException(); } - public string AssemblyName { + public string AssemblyName { get { throw new NotImplementedException(); } @@ -319,5 +301,13 @@ namespace ICSharpCode.Scripting.Tests.Utils { throw new NotImplementedException(); } + #endregion + + protected virtual void OnReferencedContentsChanged(EventArgs e) + { + if (ReferencedContentsChanged != null) { + ReferencedContentsChanged(this, e); + } + } } } diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs index f192dac3b6..63402f1dfe 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs @@ -24,7 +24,7 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests } [Test] - public void AddNamespaceContentsAddsNamespaces() + public void AddNamespaceContents_NamespacesSetToBeAdded_AddsNamespacesToList() { projectContent.NamespacesToAdd.Add("test"); projectContent.AddNamespaceContents(items, String.Empty, null, false); @@ -36,7 +36,7 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests } [Test] - public void AddNamespaceContentsAddsClasses() + public void AddNamespaceContents_OneClassInProjectContent_AddsClassToList() { MockClass c = new MockClass(new MockProjectContent(), "TestClass"); projectContent.ClassesInProjectContent.Add(c); @@ -49,20 +49,22 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests } [Test] - public void NamespaceContentsSearchedIsNullByDefault() + public void NamespacePassedToGetNamespaceContentsMethod_GetNamespaceContentsNotCalled_ReturnsNull() { - Assert.IsNull(projectContent.NamespacePassedToGetNamespaceContentsMethod); + string name = projectContent.NamespacePassedToGetNamespaceContentsMethod; + Assert.IsNull(name); } [Test] - public void NamespacePassedToGetNamespaceMethodIsSaved() + public void NamespacePassedToGetNamespaceMethod_GetNamespaceContentsCalled_ReturnsNamespacePassedMethod() { projectContent.GetNamespaceContents("abc"); - Assert.AreEqual("abc", projectContent.NamespacePassedToGetNamespaceContentsMethod); + string name = projectContent.NamespacePassedToGetNamespaceContentsMethod; + Assert.AreEqual("abc", name); } [Test] - public void GetNamespaceContentsReturnsExpectedItems() + public void GetNamespaceContents_EmptyNamespacePassed_ReturnsExpectedItemsForEmptyNamespace() { List namespaceItems = new List(); namespaceItems.Add(new NamespaceEntry("test")); @@ -76,25 +78,26 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests } [Test] - public void NamespaceExistsReturnsTrueForAddedExistingNamespace() + public void NamespaceExists_NamespaceAddedToExistingNamespaceContents_ReturnsTrue() { List items = new List(); projectContent.AddExistingNamespaceContents("System", items); - - Assert.IsTrue(projectContent.NamespaceExists("System")); + bool result = projectContent.NamespaceExists("System"); + + Assert.IsTrue(result); } [Test] - public void NamespaceExistsReturnsFalseForUnknownNamespace() + public void NamespaceExists_UnknownNamespace_ReturnsFalse() { List items = new List(); projectContent.AddExistingNamespaceContents("System", items); - - Assert.IsFalse(projectContent.NamespaceExists("Unknown")); + bool result = projectContent.NamespaceExists("Unknown"); + Assert.IsFalse(result); } [Test] - public void GetNamespaceContentsReturnsItemsForAddedExistingNamespace() + public void GetNamespaceContents_AddExistingNamespaceContentsCalledWithCompletionItemsForTwoNamespaces_ReturnsItemsForSystemNamespace() { List items = new List(); items.Add(new NamespaceEntry("test")); @@ -102,22 +105,25 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests projectContent.AddExistingNamespaceContents("Math", new List()); projectContent.AddExistingNamespaceContents("System", items); + List actualItems = projectContent.GetNamespaceContents("System"); + List expectedItems = new List(); expectedItems.Add(new NamespaceEntry("test")); - Assert.AreEqual(expectedItems, projectContent.GetNamespaceContents("System")); + Assert.AreEqual(expectedItems, actualItems); } [Test] - public void GetNamespaceContentsReturnsEmptyArrayListForUnknownNamespace() + public void GetNamespaceContents_UnknownNamespace_ReturnsEmptyArrayListF() { List items = new List(); items.Add(new NamespaceEntry("test")); projectContent.AddExistingNamespaceContents("System", items); + List actualItems = projectContent.GetNamespaceContents("Unknown"); List expectedItems = new List(); - Assert.AreEqual(expectedItems, projectContent.GetNamespaceContents("Unknown")); + Assert.AreEqual(expectedItems, actualItems); } [Test] @@ -128,88 +134,90 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests } [Test] - public void NamespaceExistsCalledIsFalseInitially() + public void NamespaceExistsCalled_NamespaceExistsMethodNotCalled_ReturnsFalse() { Assert.IsFalse(projectContent.NamespaceExistsCalled); } [Test] - public void NamespaceExistsCalledReturnsTrueAfterMethodCall() + public void NamespaceExistsCalled_NamespaceExistsMethodCalled_ReturnsTrue() { projectContent.NamespaceExists("System"); - Assert.IsTrue(projectContent.NamespaceExistsCalled); + bool result = projectContent.NamespaceExistsCalled; + Assert.IsTrue(result); } [Test] - public void GetClassReturnsNullByDefault() + public void GetClass_NewInstance_ReturnsNullByDefault() { - Assert.IsNull(projectContent.GetClass("test", 0)); + IClass c = projectContent.GetClass("test", 0); + Assert.IsNull(c); } [Test] - public void GetClassNameReturnsClassNamePassedToGetClassMethod() + public void GetClassName_GetClassCalledWithClassName_ReturnsClassNamePassedToGetClassMethod() { projectContent.GetClass("abc", 0); - Assert.AreEqual("abc", projectContent.GetClassName); + string name = projectContent.GetClassName; + Assert.AreEqual("abc", name); } [Test] - public void GetClassCalledIsFalseByDefault() + public void GetClass_ClassNameDoesNotMatchAndNoClassNameForGetClassSpecified_ReturnsTestClassSinceNoClassNameRestrictionSpecified() { - Assert.IsFalse(projectContent.GetClassCalled); - } - - [Test] - public void GetClassCalledIsTrueAfterGetClassCalled() - { - projectContent.GetClass("abc", 0); - Assert.IsTrue(projectContent.GetClassCalled); + MockClass expectedClass = new MockClass(projectContent, "test"); + projectContent.ClassToReturnFromGetClass = expectedClass; + IClass c = projectContent.GetClass("abcdef", 0); + + Assert.AreEqual(expectedClass, c); } [Test] - public void GetClassReturnsClassEvenIfClassNameDoesNotMatchAndNoClassNameForGetClassSpecified() + public void GetClass_ClassNameDoesNotMatchClassNameForGetClassProperty_ReturnsNull() { MockClass c = new MockClass(projectContent, "test"); - projectContent.ClassToReturnFromGetClass = c; + projectContent.SetClassToReturnFromGetClass("test", c); - Assert.AreEqual(c, projectContent.GetClass("abcdef", 0)); + Assert.IsNull(projectContent.GetClass("abcdef", 0)); } [Test] - public void GetClassReturnsNullIfClassNameDoesNotMatchClassNameForGetClassProperty() + public void GetClass_ClassNameMatchesClassNameForGetClassProperty_ReturnsTestClass() { - MockClass c = new MockClass(projectContent, "test"); - projectContent.ClassToReturnFromGetClass = c; - projectContent.ClassNameForGetClass = "test"; + MockClass expectedClass = new MockClass(projectContent, "test"); + projectContent.SetClassToReturnFromGetClass("test", expectedClass); - Assert.IsNull(projectContent.GetClass("abcdef", 0)); + IClass c = projectContent.GetClass("test", 0); + + Assert.AreEqual(expectedClass, c); } [Test] - public void GetClassReturnsClassIfClassNameMatchesClassNameForGetClassProperty() + public void ReferencedContents_NewInstance_HasNoItemsByDefault() { - MockClass c = new MockClass(projectContent, "test"); - projectContent.ClassToReturnFromGetClass = c; - projectContent.ClassNameForGetClass = "test"; - - Assert.AreEqual(c, projectContent.GetClass("test", 0)); + int count = projectContent.ReferencedContents.Count; + Assert.AreEqual(0, count); } [Test] - public void NamespaceNamesHasNoItemsByDefault() + public void NamespaceNames_NewInstance_HasNoItemsByDefault() { - Assert.AreEqual(0, projectContent.ReferencedContents.Count); + int count = projectContent.NamespaceNames.Count; + Assert.AreEqual(0, count); } [Test] - public void NamespaceNamesContainingsNamespaceAddedToExistingNamespaces() + public void NamespaceNames_NamespaceAddedToExistingNamespaces_NamespaceIncludedInReturnedCollection() { List namespaceItems = new List(); projectContent.AddExistingNamespaceContents("System", namespaceItems); + + ICollection names = projectContent.NamespaceNames; + List expectedNames = new List(); expectedNames.Add("System"); - Assert.AreEqual(expectedNames, projectContent.NamespaceNames); + Assert.AreEqual(expectedNames, names); } } } From 98765ade2d8187dedb40a85edc4cff251e196835 Mon Sep 17 00:00:00 2001 From: mrward Date: Thu, 23 Sep 2010 15:42:25 +0100 Subject: [PATCH 11/33] Add code completion for events in IronPython. --- .../UnitTesting/Test/UnitTesting.Tests.csproj | 2 +- .../UnitTesting/Test/Utils/MockClass.cs | 20 ++ .../Test/Utils/Tests/MockClassTestFixture.cs | 163 ------------ .../Test/Utils/Tests/MockClassTests.cs | 237 ++++++++++++++++++ .../Project/PythonBinding.csproj | 2 +- .../Project/Src/PythonMemberResolver.cs | 84 +++++++ .../Project/Src/PythonPropertyResolver.cs | 74 ------ .../Project/Src/PythonResolver.cs | 6 +- .../ProjectHasStartupObjectTestFixture.cs | 2 +- .../Test/PythonBinding.Tests.csproj | 2 + .../Test/Resolver/ResolveClassEventTests.cs | 78 ++++++ .../Resolver/ResolveClassPropertyTests.cs | 105 +++----- .../Resolver/ResolveSystemConsoleTests.cs | 2 +- .../Test/Utils/PythonResolverTestsHelper.cs | 47 ++++ .../Test/Utils/MockProjectContent.cs | 23 +- .../Utils/Tests/MockProjectContentTests.cs | 10 - 16 files changed, 513 insertions(+), 344 deletions(-) delete mode 100644 src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTestFixture.cs create mode 100644 src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs diff --git a/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj b/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj index 35aabcfa2d..0f235a3bf8 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj +++ b/src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj @@ -194,7 +194,7 @@ - + diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs index cd2810f4fd..055c1f9cf1 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs @@ -128,5 +128,25 @@ namespace UnitTesting.Tests.Utils DefaultReturnType returnType = new DefaultReturnType(baseClass); BaseTypes.Add(returnType); } + + public DefaultProperty AddProperty(string name) + { + DefaultProperty property = new DefaultProperty(this, name); + Properties.Add(property); + return property; + } + + public void InsertPropertyAtStart(string name) + { + DefaultProperty property = new DefaultProperty(this, name); + Properties.Insert(0, property); + } + + public DefaultEvent AddEvent(string name) + { + DefaultEvent classEvent = new DefaultEvent(this, name); + Events.Add(classEvent); + return classEvent; + } } } diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTestFixture.cs deleted file mode 100644 index 0f297667e0..0000000000 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTestFixture.cs +++ /dev/null @@ -1,163 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.SharpDevelop.Project; -using NUnit.Framework; -using UnitTesting.Tests.Utils; - -namespace UnitTesting.Tests.Utils.Tests -{ - [TestFixture] - public class MockClassTestFixture - { - MockClass outerClass; - MockClass innerClass; - - [Test] - public void ClassCreatedWithExpectedFullyQualifiedName() - { - string fullyQualifiedName = "MyNamespace.MyClass"; - MockClass c = new MockClass(fullyQualifiedName); - Assert.AreEqual(fullyQualifiedName, c.FullyQualifiedName); - } - - [Test] - public void ClassCreatedWithFullyQualifiedNameHasMatchingDotNetName() - { - string fullyQualifiedName = "MyNamespace.MyClass"; - MockClass c = new MockClass(fullyQualifiedName); - Assert.AreEqual(fullyQualifiedName, c.DotNetName); - } - - [Test] - public void ClassCreatedWithExpectedDotNetName() - { - string fullyQualifiedName = "MyNamespace.MyClass.InnerClass"; - string dotNetName = "MyNamespace.MyClass+InnerClass"; - MockClass c = new MockClass(fullyQualifiedName, dotNetName); - Assert.AreEqual(dotNetName, c.DotNetName); - } - - [Test] - public void ClassCreatedWithNamespaceTakenFromFullyQualifiedName() - { - string fullyQualifiedName = "MyNamespace.MySubNamespace.MyClass"; - MockClass c = new MockClass(fullyQualifiedName); - string expectedNamespace = "MyNamespace.MySubNamespace"; - Assert.AreEqual(expectedNamespace, c.Namespace); - } - - [Test] - public void ClassCreatedWithNameTakenFromFullyQualifiedName() - { - string fullyQualifiedName = "MyNamespace.MySubNamespace.MyClass"; - MockClass c = new MockClass(fullyQualifiedName); - string expectedName = "MyClass"; - Assert.AreEqual(expectedName, c.Name); - } - - [Test] - public void ClassCreatedWithNoNamespaceInFullyQualifiedNameHasNamespaceOfEmptyString() - { - string fullyQualifiedName = "MyClass"; - MockClass c = new MockClass(fullyQualifiedName); - string expectedNamespace = String.Empty; - Assert.AreEqual(expectedNamespace, c.Namespace); - } - - [Test] - public void ClassHasCompilationUnit() - { - MockClass c = new MockClass(); - Assert.IsNotNull(c.CompilationUnit); - } - - [Test] - public void ClassHasMockProjectContent() - { - MockClass c = new MockClass(); - Assert.IsNotNull(c.ProjectContent as MockProjectContent); - } - - [Test] - public void CompoundClassIsClassItself() - { - MockClass c = new MockClass(); - Assert.AreEqual(c, c.GetCompoundClass()); - } - - [Test] - public void ClassDefaultReturnTypeGetUnderlyingClassMatchesOriginalMockClass() - { - MockClass c = new MockClass(); - IReturnType returnType = c.DefaultReturnType; - Assert.AreEqual(c, returnType.GetUnderlyingClass()); - } - - [Test] - public void ClassWithInnerClassHasDeclaringTypeAsOuterClass() - { - CreateClassWithInnerClass(); - Assert.AreEqual(outerClass, innerClass.DeclaringType); - } - - void CreateClassWithInnerClass() - { - outerClass = new MockClass("MyTests.A"); - innerClass = new MockClass("MyTests.A.InnerATest", "MyTests.A+InnerATest", outerClass); - } - - [Test] - public void InnerClassGetCompoundClassReturnsInnerClass() - { - CreateClassWithInnerClass(); - Assert.AreEqual(innerClass, innerClass.GetCompoundClass()); - } - - [Test] - public void InnerClassAddedToOuterClassInnerClassCollection() - { - CreateClassWithInnerClass(); - Assert.AreEqual(innerClass, outerClass.InnerClasses[0]); - } - - [Test] - public void ClassAddedToBaseTypesBecomesBaseClass() - { - MockClass c = new MockClass(); - MockClass baseClass = new MockClass(); - DefaultReturnType returnType = new DefaultReturnType(baseClass); - c.BaseTypes.Add(returnType); - Assert.AreEqual(baseClass, c.BaseClass); - } - - [Test] - public void BaseClassPropertyReturnsClassAddedUsingAddBaseClassMethod() - { - MockClass c = new MockClass(); - MockClass baseClass = new MockClass(); - c.AddBaseClass(baseClass); - Assert.AreEqual(baseClass, c.BaseClass); - } - - [Test] - public void ClassWithProjectContentHasExpectedDotNetName() - { - MockProjectContent projectContent = new MockProjectContent(); - string expectedName = "MyNamespace.MyTests"; - MockClass c = new MockClass(projectContent, expectedName); - Assert.AreEqual(expectedName, c.DotNetName); - } - - [Test] - public void GetCompoundClassReturnsClassSetWithSetCompoundClass() - { - MockClass c = new MockClass(); - MockClass compoundClass = new MockClass(); - c.SetCompoundClass(compoundClass); - Assert.AreEqual(compoundClass, c.GetCompoundClass()); - } - } -} diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs new file mode 100644 index 0000000000..c7a6c55a4e --- /dev/null +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs @@ -0,0 +1,237 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.SharpDevelop.Dom; +using ICSharpCode.SharpDevelop.Project; +using NUnit.Framework; +using UnitTesting.Tests.Utils; + +namespace UnitTesting.Tests.Utils.Tests +{ + [TestFixture] + public class MockClassTests + { + MockClass outerClass; + MockClass innerClass; + + [Test] + public void FullyQualifiedName_NewInstanceCreatedWithFullyQualifiedName_ReturnsFullyQualifiedName() + { + string expectedFullyQualifiedName = "MyNamespace.MyClass"; + MockClass c = new MockClass(expectedFullyQualifiedName); + string fullyQualifiedName = c.FullyQualifiedName; + Assert.AreEqual(expectedFullyQualifiedName, fullyQualifiedName); + } + + [Test] + public void DotNetName_NewInstanceCreatedWithFullyQualifiedName_ReturnsDotNetNameThatMatchesFullyQualifiedName() + { + string fullyQualifiedName = "MyNamespace.MyClass"; + MockClass c = new MockClass(fullyQualifiedName); + string dotNetName = c.DotNetName; + Assert.AreEqual(fullyQualifiedName, dotNetName); + } + + [Test] + public void DotNetName_NewInstanceCreatedWithFullyQualifiedNameAndDotNetName_ReturnsExpectedDotNetName() + { + string fullyQualifiedName = "MyNamespace.MyClass.InnerClass"; + string expectedDotNetName = "MyNamespace.MyClass+InnerClass"; + MockClass c = new MockClass(fullyQualifiedName, expectedDotNetName); + string dotNetName = c.DotNetName; + Assert.AreEqual(expectedDotNetName, dotNetName); + } + + [Test] + public void Namespace_NewInstanceCreatedWithFullyQualifiedName_ReturnsNamespaceTakenFromFullyQualifiedName() + { + string fullyQualifiedName = "MyNamespace.MySubNamespace.MyClass"; + MockClass c = new MockClass(fullyQualifiedName); + string expectedNamespace = "MyNamespace.MySubNamespace"; + string actualNamespace = c.Namespace; + Assert.AreEqual(expectedNamespace, actualNamespace); + } + + [Test] + public void Name_NewInstanceCreatedWithFullyQualifiedName_ReturnsNameTakenFromFullyQualifiedName() + { + string fullyQualifiedName = "MyNamespace.MySubNamespace.MyClass"; + MockClass c = new MockClass(fullyQualifiedName); + string expectedName = "MyClass"; + string name = c.Name; + Assert.AreEqual(expectedName, name); + } + + [Test] + public void Namesapce_NewInstanceCreatedWithFullyQualifiedNameWithNoNamespace_ReturnsEmptyStringAsNamespace() + { + string fullyQualifiedName = "MyClass"; + MockClass c = new MockClass(fullyQualifiedName); + string expectedNamespace = String.Empty; + string actualNamespace = c.Namespace; + Assert.AreEqual(expectedNamespace, actualNamespace); + } + + [Test] + public void CompilationUnit_NewInstanceCreated_ReturnsNonNullCompilationUnit() + { + MockClass c = new MockClass(); + ICompilationUnit unit = c.CompilationUnit; + Assert.IsNotNull(unit); + } + + [Test] + public void ProjectContent_NewInstanceCreated_ReturnsMockProjectContent() + { + MockClass c = new MockClass(); + MockProjectContent projectContent = c.ProjectContent as MockProjectContent; + Assert.IsNotNull(projectContent); + } + + [Test] + public void CompoundClass_NewInstance_ReturnsClassItself() + { + MockClass c = new MockClass(); + IClass compoundClass = c.GetCompoundClass(); + Assert.AreEqual(c, compoundClass); + } + + [Test] + public void DefaultReturnTypeGetUnderlyClass_NewInstance_ReturnsOriginalMockClass() + { + MockClass c = new MockClass(); + IReturnType returnType = c.DefaultReturnType; + IClass underlyingClass = returnType.GetUnderlyingClass(); + Assert.AreEqual(c, underlyingClass); + } + + [Test] + public void DeclaringType_NewInstanceWithInnerClass_InnerClassHasOuterClassAsDeclaringType() + { + CreateClassWithInnerClass(); + IClass declaringType = innerClass.DeclaringType; + Assert.AreEqual(outerClass, declaringType); + } + + void CreateClassWithInnerClass() + { + outerClass = new MockClass("MyTests.A"); + innerClass = new MockClass("MyTests.A.InnerATest", "MyTests.A+InnerATest", outerClass); + } + + [Test] + public void GetCompoundClass_NewInstanceWithInnerClass_InnerClassReturnsInnerClassAsCompoundClass() + { + CreateClassWithInnerClass(); + IClass compoundClass = innerClass.GetCompoundClass(); + Assert.AreEqual(innerClass, compoundClass); + } + + [Test] + public void InnerClasses_NewInstanceCreatedWithInnerClass_FirstClassInCollectionIsInnerClass() + { + CreateClassWithInnerClass(); + IClass firstInnerClass = outerClass.InnerClasses[0]; + Assert.AreEqual(innerClass, firstInnerClass); + } + + [Test] + public void BaseClass_ClassAddedToBaseTypes_ClassAddedToBaseTypesBecomesBaseClass() + { + MockClass c = new MockClass(); + MockClass baseClass = new MockClass(); + DefaultReturnType returnType = new DefaultReturnType(baseClass); + c.BaseTypes.Add(returnType); + IClass actualBaseClass = c.BaseClass; + Assert.AreEqual(baseClass, actualBaseClass); + } + + [Test] + public void BaseClass_AddBaseClassMethodCalled_ReturnsClassAddedUsingAddBaseClassMethod() + { + MockClass c = new MockClass(); + MockClass baseClass = new MockClass(); + c.AddBaseClass(baseClass); + IClass actualBaseClass = c.BaseClass; + Assert.AreEqual(baseClass, actualBaseClass); + } + + [Test] + public void DotNetName_NewInstanceCreatedWithProjectContent_ReturnsFullyQualifiedNameAsDotNetName() + { + MockProjectContent projectContent = new MockProjectContent(); + string expectedName = "MyNamespace.MyTests"; + MockClass c = new MockClass(projectContent, expectedName); + string dotNetName = c.DotNetName; + Assert.AreEqual(expectedName, dotNetName); + } + + [Test] + public void GetCompoundClass_SetCompoundClassMethodCalled_ReturnsClassPassedToSetCompoundClass() + { + MockClass c = new MockClass(); + MockClass compoundClass = new MockClass(); + c.SetCompoundClass(compoundClass); + IClass actualCompoundClass = c.GetCompoundClass(); + Assert.AreEqual(compoundClass, actualCompoundClass); + } + + [Test] + public void AddProperty_PassedPropertyName_AddsPropertyToClass() + { + MockClass c = new MockClass(); + c.AddProperty("MyProperty"); + + IProperty property = c.Properties[0]; + string name = property.Name; + + Assert.AreEqual("MyProperty", name); + } + + [Test] + public void InsertPropertyAtStart_PassedPropertyName_AddsPropertyAsFirstProperty() + { + MockClass c = new MockClass(); + c.AddProperty("SecondProperty"); + c.InsertPropertyAtStart("FirstProperty"); + + IProperty property = c.Properties[0]; + string name = property.Name; + + Assert.AreEqual("FirstProperty", name); + } + + [Test] + public void AddProperty_PassedPropertyName_ReturnsPropertyWithExpectedName() + { + MockClass c = new MockClass(); + IProperty property = c.AddProperty("MyProperty"); + string name = property.Name; + + Assert.AreEqual("MyProperty", name); + } + + [Test] + public void AddEvent_PassedEventName_AddsEventToClass() + { + MockClass c = new MockClass(); + c.AddEvent("MyEvent"); + + IEvent myEvent = c.Events[0]; + string name = myEvent.Name; + + Assert.AreEqual("MyEvent", name); + } + + [Test] + public void AddEvent_PassedEventName_ReturnsEventWithExpectedName() + { + MockClass c = new MockClass(); + IEvent myEvent = c.AddEvent("MyEvent"); + string name = myEvent.Name; + + Assert.AreEqual("MyEvent", name); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index c401b03d1d..b95b31ea8f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -101,13 +101,13 @@ + - diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs new file mode 100644 index 0000000000..cf6ebe6dd6 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs @@ -0,0 +1,84 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Collections.Generic; +using ICSharpCode.SharpDevelop.Dom; + +namespace ICSharpCode.PythonBinding +{ + /// + /// Resolves properties, events and fields. + /// + public class PythonMemberResolver : IPythonResolver + { + PythonClassResolver classResolver; + + public PythonMemberResolver(PythonClassResolver classResolver) + { + this.classResolver = classResolver; + } + + public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + { + IMember member = FindMember(resolverContext, expressionResult.Expression); + if (member != null) { + return CreateMemberResolveResult(member); + } + return null; + } + + IMember FindMember(PythonResolverContext resolverContext, string expression) + { + MemberName memberName = new MemberName(expression); + if (memberName.HasName) { + IClass c = resolverContext.GetClass(memberName.Type); + if (c != null) { + return FindMemberInClass(c, memberName.Name); + } else { + return FindMember(resolverContext, memberName); + } + } + return null; + } + + MemberResolveResult CreateMemberResolveResult(IMember member) + { + return new MemberResolveResult(null, null, member); + } + + IMember FindMemberInClass(IClass matchingClass, string memberName) + { + List members = GetMembers(matchingClass); + foreach (IMember member in members) { + if (member.Name == memberName) { + return member; + } + } + return null; + } + + List GetMembers(IClass c) + { + List members = new List(); + members.AddRange(c.Events); + members.AddRange(c.Properties); + return members; + } + + IMember FindMember(PythonResolverContext resolverContext, MemberName memberName) + { + IMember parentMember = FindMember(resolverContext, memberName.Type); + if (parentMember != null) { + return FindMemberInParent(parentMember, memberName.Name); + } + return null; + } + + IMember FindMemberInParent(IMember parentMember, string propertyName) + { + IClass parentMemberClass = parentMember.ReturnType.GetUnderlyingClass(); + return FindMemberInClass(parentMemberClass, propertyName); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs deleted file mode 100644 index 9900b4bcc2..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonPropertyResolver.cs +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.SharpDevelop.Dom; - -namespace ICSharpCode.PythonBinding -{ - public class PythonPropertyResolver : IPythonResolver - { - PythonClassResolver classResolver; - - public PythonPropertyResolver(PythonClassResolver classResolver) - { - this.classResolver = classResolver; - } - - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) - { - IProperty property = FindProperty(resolverContext, expressionResult.Expression); - if (property != null) { - return CreateMemberResolveResult(property); - } - return null; - } - - IProperty FindProperty(PythonResolverContext resolverContext, string expression) - { - MemberName memberName = new MemberName(expression); - IClass matchingClass = FindClass(resolverContext, memberName.Type); - if (matchingClass != null) { - return FindPropertyInClass(matchingClass, memberName.Name); - } else if (memberName.HasName) { - return FindProperty(resolverContext, memberName); - } - return null; - } - - MemberResolveResult CreateMemberResolveResult(IProperty property) - { - return new MemberResolveResult(null, null, property); - } - - IClass FindClass(PythonResolverContext resolverContext, string typeName) - { - return classResolver.GetClass(resolverContext, typeName); - } - - IProperty FindPropertyInClass(IClass matchingClass, string memberName) - { - foreach (IProperty property in matchingClass.Properties) { - if (property.Name == memberName) { - return property; - } - } - return null; - } - - IProperty FindProperty(PythonResolverContext resolverContext, MemberName memberName) - { - IProperty parentProperty = FindProperty(resolverContext, memberName.Type); - if (parentProperty != null) { - return FindPropertyInProperty(parentProperty, memberName.Name); - } - return null; - } - - IProperty FindPropertyInProperty(IProperty parentProperty, string propertyName) - { - IClass parentPropertyClass = parentProperty.ReturnType.GetUnderlyingClass(); - return FindPropertyInClass(parentPropertyClass, propertyName); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs index b577a14725..3bc88aca4e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs @@ -19,19 +19,19 @@ namespace ICSharpCode.PythonBinding PythonStandardModuleResolver standardModuleResolver = new PythonStandardModuleResolver(); PythonSelfResolver selfResolver = new PythonSelfResolver(); PythonMethodResolver methodResolver; - PythonPropertyResolver propertyResolver; + PythonMemberResolver memberResolver; List resolvers = new List(); public PythonResolver() { methodResolver = new PythonMethodResolver(classResolver, standardModuleResolver); - propertyResolver = new PythonPropertyResolver(classResolver); + memberResolver = new PythonMemberResolver(classResolver); resolvers.Add(importResolver); resolvers.Add(classResolver); resolvers.Add(standardModuleResolver); - resolvers.Add(propertyResolver); + resolvers.Add(memberResolver); resolvers.Add(methodResolver); resolvers.Add(selfResolver); resolvers.Add(namespaceResolver); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs index a233da9247..683317e769 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs @@ -65,7 +65,7 @@ namespace PythonBinding.Tests.Converter mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); MockClass mainClass = new MockClass(mockProjectContent, startupObject); mainClass.CompilationUnit.FileName = @"d:\projects\test\src\Main2.cs"; - mockProjectContent.ClassToReturnFromGetClass = mainClass; + mockProjectContent.SetClassToReturnFromGetClass(startupObject, mainClass); convertProjectCommand = new DerivedConvertProjectToPythonProjectCommand(); convertProjectCommand.ProjectContent = mockProjectContent; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 45b300c7e4..bb9fc77ecc 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -350,6 +350,7 @@ + @@ -425,6 +426,7 @@ + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs new file mode 100644 index 0000000000..4e7c0ac4a0 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs @@ -0,0 +1,78 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests resolving events for the following classes: + /// + /// public class MyClass + /// { + /// public event EventHandler MyEvent; + /// } + /// + /// + [TestFixture] + public class ResolveClassEventTests + { + PythonResolverTestsHelper resolverHelper; + IEvent myClassEvent; + MockClass myClass; + IProperty eventHandlerTargetProperty; + + void CreateClassWithOneEvent() + { + resolverHelper = new PythonResolverTestsHelper(); + myClass = resolverHelper.CreateClass("MyClass"); + myClassEvent = myClass.AddEvent("MyEvent"); + + AddEventHandlerClass(); + + resolverHelper.ProjectContent.SetClassToReturnFromGetClass("MyClass", myClass); + } + + void AddEventHandlerClass() + { + MockClass eventHandlerClass = resolverHelper.CreateClass("EventHandler"); + eventHandlerTargetProperty = eventHandlerClass.AddProperty("Target"); + myClassEvent.ReturnType = new DefaultReturnType(eventHandlerClass); + } + + [Test] + public void Resolve_ExpressionIsForEventOnClass_MemberResolveResultResolvedTypeIsClassEvent() + { + CreateClassWithOneEvent(); + resolverHelper.Resolve("MyClass.MyEvent"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + + Assert.AreEqual(myClassEvent, resolvedMember); + } + + [Test] + public void Resolve_ExpressionIsForSecondEventOnClass_MemberResolveResultResolvedTypeIsSecondEvent() + { + CreateClassWithOneEvent(); + IEvent secondEvent = myClass.AddEvent("SecondEvent"); + resolverHelper.Resolve("MyClass.SecondEvent"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + + Assert.AreEqual(secondEvent, resolvedMember); + } + + [Test] + public void Resolve_ExpressionIsForEventHandlerTargetProperty_MemberResolveResultResolvedTypeIsEventHandlerTargetProperty() + { + CreateClassWithOneEvent(); + resolverHelper.Resolve("MyClass.MyEvent.Target"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + + Assert.AreEqual(eventHandlerTargetProperty, resolvedMember); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs index f7cc9c3de4..f710694f91 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs @@ -2,75 +2,59 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using ICSharpCode.PythonBinding; -using ScriptingUtils = ICSharpCode.Scripting.Tests.Utils; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; +using PythonBinding.Tests.Utils; using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.Resolver { + /// + /// Tests resolving properties for the following classes: + /// + /// public class MyClass + /// { + /// public MyNestedPropertyClass MyProperty { get; set; } + /// } + /// + /// public class MyNestedPropertyClass + /// { + /// public object MyNestedProperty { get; set; } + /// } + /// + /// [TestFixture] public class ResolveClassPropertyTests { - ResolveResult result; - ParseInformation parseInfo; - ScriptingUtils.MockProjectContent projectContent; + PythonResolverTestsHelper resolverHelper; IProperty myClassProperty; MockClass myClass; IProperty nestedClassProperty; - void ResolvePropertyExpression(string expression) + void CreateClassWithOneProperty() { - PythonResolverContext context = new PythonResolverContext(parseInfo); - ExpressionResult expressionResult = new ExpressionResult(expression); + resolverHelper = new PythonResolverTestsHelper(); + myClass = resolverHelper.CreateClass("MyClass"); + myClassProperty = myClass.AddProperty("MyProperty"); - PythonResolver resolver = new PythonResolver(); - result = resolver.Resolve(context, expressionResult); - } - - void CreateParseInfoWithOneClassWithOneProperty() - { - projectContent = new ScriptingUtils.MockProjectContent(); - myClass = new MockClass(projectContent, "MyClass"); - - myClassProperty = AddPropertyToClass("MyProperty", myClass); - - DefaultCompilationUnit unit = new DefaultCompilationUnit(projectContent); - parseInfo = new ParseInformation(unit); + AddNestedPropertyToExistingProperty(); - projectContent.SetClassToReturnFromGetClass("MyClass", myClass); + resolverHelper.ProjectContent.SetClassToReturnFromGetClass("MyClass", myClass); } - IProperty AddPropertyToClass(string propertyName, IClass c) - { - IProperty property = CreateProperty(propertyName, c); - c.Properties.Add(property); - return property; - } - - IProperty CreateProperty(string propertyName, IClass c) - { - return new DefaultProperty(c, propertyName); - } - - [Test] - public void Resolve_ExpressionIsForPropertyOnClassWithOneProperty_ReturnsMemberResolveResult() + void AddNestedPropertyToExistingProperty() { - CreateParseInfoWithOneClassWithOneProperty(); - ResolvePropertyExpression("MyClass.MyProperty"); - MemberResolveResult memberResolveResult = result as MemberResolveResult; - - Assert.IsNotNull(memberResolveResult); + MockClass nestedPropertyClass = resolverHelper.CreateClass("MyNestedPropertyClass"); + nestedClassProperty = nestedPropertyClass.AddProperty("MyNestedProperty"); + myClassProperty.ReturnType = new DefaultReturnType(nestedPropertyClass); } [Test] public void Resolve_ExpressionIsForPropertyOnClassWithOneProperty_MemberResolveResultResolvedTypeIsMyClassProperty() { - CreateParseInfoWithOneClassWithOneProperty(); - ResolvePropertyExpression("MyClass.MyProperty"); - MemberResolveResult memberResolveResult = result as MemberResolveResult; - IMember resolvedMember = memberResolveResult.ResolvedMember; + CreateClassWithOneProperty(); + resolverHelper.Resolve("MyClass.MyProperty"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; Assert.AreEqual(myClassProperty, resolvedMember); } @@ -78,40 +62,23 @@ namespace PythonBinding.Tests.Resolver [Test] public void Resolve_ExpressionIsForSecondPropertyOnClassWithTwoProperties_MemberResolveResultResolvedTypeIsSecondClassProperty() { - CreateParseInfoWithOneClassWithOneProperty(); - InsertNewPropertyOnClassBeforeExistingProperty(); - ResolvePropertyExpression("MyClass.MyProperty"); - - MemberResolveResult memberResolveResult = result as MemberResolveResult; - IMember resolvedMember = memberResolveResult.ResolvedMember; + CreateClassWithOneProperty(); + myClass.InsertPropertyAtStart("ExtraProperty"); + resolverHelper.Resolve("MyClass.MyProperty"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; Assert.AreEqual(myClassProperty, resolvedMember); } - void InsertNewPropertyOnClassBeforeExistingProperty() - { - IProperty extraProperty = CreateProperty("ExtraProperty", myClass); - myClass.Properties.Insert(0, extraProperty); - } - [Test] public void Resolve_ExpressionRefersToNestedProperty_MemberResolveResultResolvedTypeIsNestedProperty() { - CreateParseInfoWithOneClassWithOneProperty(); + CreateClassWithOneProperty(); AddNestedPropertyToExistingProperty(); - ResolvePropertyExpression("MyClass.MyProperty.MyNestedProperty"); - - MemberResolveResult memberResolveResult = result as MemberResolveResult; - IMember resolvedMember = memberResolveResult.ResolvedMember; + resolverHelper.Resolve("MyClass.MyProperty.MyNestedProperty"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; Assert.AreEqual(nestedClassProperty, resolvedMember); } - - void AddNestedPropertyToExistingProperty() - { - MockClass nestedPropertyClass = new MockClass(projectContent, "MyNestedPropertyClass"); - nestedClassProperty = AddPropertyToClass("MyNestedProperty", nestedPropertyClass); - myClassProperty.ReturnType = new DefaultReturnType(nestedPropertyClass); - } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs index ca2f758605..40204ee443 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSystemConsoleTests.cs @@ -34,7 +34,7 @@ namespace PythonBinding.Tests.Resolver mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); systemConsoleClass = new MockClass(mockProjectContent, "System.Console"); - mockProjectContent.ClassToReturnFromGetClass = systemConsoleClass; + mockProjectContent.SetClassToReturnFromGetClass("System.Console", systemConsoleClass); compilationUnit = CreateCompilationUnit(mockProjectContent); ParseInformation parseInfo = new ParseInformation(compilationUnit); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs new file mode 100644 index 0000000000..61045b0291 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs @@ -0,0 +1,47 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.PythonBinding; +using ICSharpCode.SharpDevelop.Dom; +using UnitTesting.Tests.Utils; +using ScriptingUtils = ICSharpCode.Scripting.Tests.Utils; + +namespace PythonBinding.Tests.Utils +{ + public class PythonResolverTestsHelper + { + public ScriptingUtils.MockProjectContent ProjectContent; + public DefaultCompilationUnit CompilationUnit; + public ParseInformation ParseInfo; + public PythonResolverContext Context; + public PythonResolver Resolver; + public ResolveResult ResolveResult; + + public PythonResolverTestsHelper() + { + ProjectContent = new ScriptingUtils.MockProjectContent(); + CompilationUnit = new DefaultCompilationUnit(ProjectContent); + ParseInfo = new ParseInformation(CompilationUnit); + Context = new PythonResolverContext(ParseInfo); + + Resolver = new PythonResolver(); + } + + public ResolveResult Resolve(string expression) + { + ExpressionResult expressionResult = new ExpressionResult(expression); + ResolveResult = Resolver.Resolve(Context, expressionResult); + return ResolveResult; + } + + public MemberResolveResult MemberResultResult { + get { return ResolveResult as MemberResolveResult; } + } + + public MockClass CreateClass(string name) + { + return new MockClass(ProjectContent, name); + } + } +} diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs index b2d887860a..e15f86ed08 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProjectContent.cs @@ -68,29 +68,10 @@ namespace ICSharpCode.Scripting.Tests.Utils get { return searchTypeRequest; } } - /// - /// Gets or sets the class to return from the GetClass Method. - /// - public IClass ClassToReturnFromGetClass - { - get { return classToReturnFromGetClass; } - set { classToReturnFromGetClass = value; } - } - - /// - /// Gets or sets the class name that needs to match in order - /// for the GetClass call to return a class. If nothing is - /// specified then every class name matches. - /// - public string ClassNameForGetClass { - get { return classNameForGetClass; } - set { classNameForGetClass = value; } - } - public void SetClassToReturnFromGetClass(string className, IClass classToReturn) { - ClassToReturnFromGetClass = classToReturn; - ClassNameForGetClass = className; + classToReturnFromGetClass = classToReturn; + classNameForGetClass = className; } /// diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs index 63402f1dfe..bc60053e6a 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/MockProjectContentTests.cs @@ -162,16 +162,6 @@ namespace ICSharpCode.Scripting.Tests.Utils.Tests Assert.AreEqual("abc", name); } - [Test] - public void GetClass_ClassNameDoesNotMatchAndNoClassNameForGetClassSpecified_ReturnsTestClassSinceNoClassNameRestrictionSpecified() - { - MockClass expectedClass = new MockClass(projectContent, "test"); - projectContent.ClassToReturnFromGetClass = expectedClass; - IClass c = projectContent.GetClass("abcdef", 0); - - Assert.AreEqual(expectedClass, c); - } - [Test] public void GetClass_ClassNameDoesNotMatchClassNameForGetClassProperty_ReturnsNull() { From b7ec2521841270830dbd38980c22f31c06d64fa9 Mon Sep 17 00:00:00 2001 From: mrward Date: Thu, 23 Sep 2010 16:13:21 +0100 Subject: [PATCH 12/33] IronPython member resolver now finds types that have been imported. --- .../Project/Src/PythonMemberResolver.cs | 7 ++++++- .../Test/Resolver/ResolveClassEventTests.cs | 8 ++++++-- .../Test/Utils/PythonResolverTestsHelper.cs | 12 ++++++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs index cf6ebe6dd6..3d184d0900 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs @@ -32,7 +32,7 @@ namespace ICSharpCode.PythonBinding { MemberName memberName = new MemberName(expression); if (memberName.HasName) { - IClass c = resolverContext.GetClass(memberName.Type); + IClass c = FindClass(resolverContext, memberName.Type); if (c != null) { return FindMemberInClass(c, memberName.Name); } else { @@ -42,6 +42,11 @@ namespace ICSharpCode.PythonBinding return null; } + IClass FindClass(PythonResolverContext resolverContext, string className) + { + return classResolver.GetClass(resolverContext, className); + } + MemberResolveResult CreateMemberResolveResult(IMember member) { return new MemberResolveResult(null, null, member); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs index 4e7c0ac4a0..c40495cad3 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs @@ -28,13 +28,17 @@ namespace PythonBinding.Tests.Resolver void CreateClassWithOneEvent() { - resolverHelper = new PythonResolverTestsHelper(); + // Define imports. + string code = + "from MyNamespace import MyClass"; + + resolverHelper = new PythonResolverTestsHelper(code); myClass = resolverHelper.CreateClass("MyClass"); myClassEvent = myClass.AddEvent("MyEvent"); AddEventHandlerClass(); - resolverHelper.ProjectContent.SetClassToReturnFromGetClass("MyClass", myClass); + resolverHelper.ProjectContent.SetClassToReturnFromGetClass("MyNamespace.MyClass", myClass); } void AddEventHandlerClass() diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs index 61045b0291..51eb76f5f9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs @@ -18,16 +18,24 @@ namespace PythonBinding.Tests.Utils public PythonResolver Resolver; public ResolveResult ResolveResult; - public PythonResolverTestsHelper() + public PythonResolverTestsHelper(string code) { ProjectContent = new ScriptingUtils.MockProjectContent(); - CompilationUnit = new DefaultCompilationUnit(ProjectContent); + PythonParser parser = new PythonParser(); + string fileName = @"test.py"; + CompilationUnit = parser.Parse(ProjectContent, fileName, code) as DefaultCompilationUnit; + ParseInfo = new ParseInformation(CompilationUnit); Context = new PythonResolverContext(ParseInfo); Resolver = new PythonResolver(); } + public PythonResolverTestsHelper() + : this(String.Empty) + { + } + public ResolveResult Resolve(string expression) { ExpressionResult expressionResult = new ExpressionResult(expression); From b90aac802437696dd60c7eead658d0a0e5fc9c73 Mon Sep 17 00:00:00 2001 From: mrward Date: Thu, 23 Sep 2010 17:10:59 +0100 Subject: [PATCH 13/33] Add IronPython code completion for class fields. --- .../UnitTesting/Test/Utils/MockClass.cs | 7 +++ .../Test/Utils/Tests/MockClassTests.cs | 22 ++++++++ .../Project/Src/PythonMemberResolver.cs | 1 + .../Test/PythonBinding.Tests.csproj | 1 + .../Test/Resolver/ResolveClassFieldTests.cs | 52 +++++++++++++++++++ 5 files changed, 83 insertions(+) create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs index 055c1f9cf1..da0cb9b97c 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockClass.cs @@ -148,5 +148,12 @@ namespace UnitTesting.Tests.Utils Events.Add(classEvent); return classEvent; } + + public DefaultField AddField(string name) + { + DefaultField field = new DefaultField(this, name); + Fields.Add(field); + return field; + } } } diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs index c7a6c55a4e..8373db55e4 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockClassTests.cs @@ -233,5 +233,27 @@ namespace UnitTesting.Tests.Utils.Tests Assert.AreEqual("MyEvent", name); } + + [Test] + public void AddField_PassedFieldName_AddsFieldToClass() + { + MockClass c = new MockClass(); + c.AddField("MyField"); + + IField myField = c.Fields[0]; + string name = myField.Name; + + Assert.AreEqual("MyField", name); + } + + [Test] + public void AddField_PassedFieldName_ReturnsFieldWithExpectedName() + { + MockClass c = new MockClass(); + IField myField = c.AddField("MyField"); + string name = myField.Name; + + Assert.AreEqual("MyField", name); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs index 3d184d0900..3c7b70670e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs @@ -67,6 +67,7 @@ namespace ICSharpCode.PythonBinding { List members = new List(); members.AddRange(c.Events); + members.AddRange(c.Fields); members.AddRange(c.Properties); return members; } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index bb9fc77ecc..da40fbfda1 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -351,6 +351,7 @@ + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs new file mode 100644 index 0000000000..bdc02632a4 --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs @@ -0,0 +1,52 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.SharpDevelop.Dom; +using NUnit.Framework; +using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; + +namespace PythonBinding.Tests.Resolver +{ + /// + /// Tests resolving events for the following classes: + /// + /// public class MyClass + /// { + /// public int MyField + /// } + /// + /// public class MyClassWithFields + /// { + /// public int MyField = 0; + /// } + /// + /// + [TestFixture] + public class ResolveClassFieldTests + { + PythonResolverTestsHelper resolverHelper; + IField myClassField; + MockClass myClass; + + void CreateClassWithOneEvent() + { + resolverHelper = new PythonResolverTestsHelper(); + myClass = resolverHelper.CreateClass("MyClass"); + myClassField = myClass.AddField("MyField"); + + resolverHelper.ProjectContent.SetClassToReturnFromGetClass("MyClass", myClass); + } + + [Test] + public void Resolve_ExpressionIsForFieldOnClass_MemberResolveResultResolvedTypeIsClassField() + { + CreateClassWithOneEvent(); + resolverHelper.Resolve("MyClass.MyField"); + IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + + Assert.AreEqual(myClassField, resolvedMember); + } + } +} From 1b31c480d4b2dc771fcc03cd8255ad7b8df7eb81 Mon Sep 17 00:00:00 2001 From: mrward Date: Thu, 23 Sep 2010 20:06:59 +0100 Subject: [PATCH 14/33] Re-enable basic support for local variable code completion in IronPython. --- .../Project/PythonBinding.csproj | 2 +- ...lver.cs => PythonLocalVariableResolver.cs} | 73 +++++++++++++---- .../PythonBinding/Project/Src/PythonParser.cs | 41 ++++++---- .../Project/Src/PythonResolver.cs | 45 ++++------- .../Project/Src/PythonResolverContext.cs | 11 +++ .../Test/PythonBinding.Tests.csproj | 2 +- .../PythonLocalVariableResolverTests.cs | 78 +++++++++++++++++++ .../Test/Resolver/ResolveClassEventTests.cs | 6 +- .../Test/Resolver/ResolveClassFieldTests.cs | 2 +- ...veClassInstanceWithNamespaceTestFixture.cs | 41 ---------- .../Resolver/ResolveClassPropertyTests.cs | 6 +- .../ResolveLocalClassInstanceTests.cs | 78 +++---------------- .../Test/Utils/PythonResolverTestsHelper.cs | 21 +++-- 13 files changed, 221 insertions(+), 185 deletions(-) rename src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/{PythonVariableResolver.cs => PythonLocalVariableResolver.cs} (64%) create mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassInstanceWithNamespaceTestFixture.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index b95b31ea8f..12fd3f4a92 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -101,6 +101,7 @@ + @@ -163,7 +164,6 @@ - Chiron.exe.Config diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonVariableResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs similarity index 64% rename from src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonVariableResolver.cs rename to src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs index 0523c0217d..9479733afa 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonVariableResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs @@ -21,17 +21,13 @@ namespace ICSharpCode.PythonBinding /// /// Determines the type of a variable. /// - public class PythonVariableResolver : PythonWalker + public class PythonLocalVariableResolver : PythonWalker, IPythonResolver { string variableName = String.Empty; string typeName; AssignmentStatement currentAssignStatement; bool foundVariableAssignment; - public PythonVariableResolver() - { - } - /// /// The resolved type name. /// @@ -44,20 +40,22 @@ namespace ICSharpCode.PythonBinding /// /// Name of the variable. /// The python code containing the variable. - public string Resolve(string variableName, string fileName, string code) + public string Resolve(string variableName, string code) { if (code != null) { - ScriptEngine scriptEngine = IronPython.Hosting.Python.CreateEngine(); - PythonCompilerSink sink = new PythonCompilerSink(); - SourceUnit source = DefaultContext.DefaultPythonContext.CreateFileUnit(fileName, code); - CompilerContext context = new CompilerContext(source, new PythonCompilerOptions(), sink); - Parser parser = Parser.CreateParser(context, new PythonOptions()); - PythonAst ast = parser.ParseFile(false); - + PythonParser parser = new PythonParser(); + PythonAst ast = parser.CreateAst("resolver.py", code); return Resolve(variableName, ast); } return null; } + + string Resolve(string variableName, PythonAst ast) + { + this.variableName = variableName; + ast.Walk(this); + return TypeName; + } public override bool Walk(AssignmentStatement node) { @@ -136,11 +134,52 @@ namespace ICSharpCode.PythonBinding return typeName.ToString(); } - string Resolve(string variableName, PythonAst ast) + public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) { - this.variableName = variableName; - ast.Walk(this); - return TypeName; + return GetLocalVariable(resolverContext, expressionResult.Expression); + } + + /// + /// Tries to find the type that matches the local variable name. + /// + LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext, string expression) + { + PythonLocalVariableResolver resolver = new PythonLocalVariableResolver(); + string typeName = resolver.Resolve(expression, resolverContext.FileContent); + if (typeName != null) { + return CreateLocalResolveResult(typeName, expression, resolverContext); + } + return null; + } + + LocalResolveResult CreateLocalResolveResult(string typeName, string identifier, PythonResolverContext resolverContext) + { + IClass resolvedClass = resolverContext.GetClass(typeName); + if (resolvedClass != null) { + return CreateLocalResolveResult(identifier, resolvedClass); + } + return null; + } + + LocalResolveResult CreateLocalResolveResult(string identifier, IClass resolvedClass) + { + DefaultMethod dummyMethod = CreateDummyMethod(); + DefaultField.LocalVariableField field = CreateLocalVariableField(identifier, resolvedClass, dummyMethod.DeclaringType); + return new LocalResolveResult(dummyMethod, field); + } + + DefaultField.LocalVariableField CreateLocalVariableField(string identifier, IClass resolvedClass, IClass callingClass) + { + return new DefaultField.LocalVariableField(resolvedClass.DefaultReturnType, + identifier, + DomRegion.Empty, + callingClass); + } + + DefaultMethod CreateDummyMethod() + { + DefaultClass dummyClass = new DefaultClass(DefaultCompilationUnit.DummyCompilationUnit, "Global"); + return new DefaultMethod(dummyClass, String.Empty); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonParser.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonParser.cs index 4ab47e70e9..c8b1f85de5 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonParser.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonParser.cs @@ -27,10 +27,6 @@ namespace ICSharpCode.PythonBinding string[] lexerTags = new string[0]; ScriptEngine scriptEngine; - public PythonParser() - { - } - public string[] LexerTags { get { return lexerTags; } set { lexerTags = value; } @@ -40,10 +36,6 @@ namespace ICSharpCode.PythonBinding get { return LanguageProperties.None; } } - - /// - /// Creates a PythonExpressionFinder. - /// public IExpressionFinder CreateExpressionFinder(string fileName) { return new PythonExpressionFinder(); @@ -75,14 +67,22 @@ namespace ICSharpCode.PythonBinding /// /// Parses a python file and creates a PythonAst. /// - public PythonAst CreateAst(string fileName, ITextBuffer fileContent) + public PythonAst CreateAst(string fileName, ITextBuffer textBuffer) + { + return CreateAst(fileName, textBuffer.Text); + } + + /// + /// Parses a python file and creates a PythonAst. + /// + public PythonAst CreateAst(string fileName, string fileContent) { if (scriptEngine == null) { scriptEngine = IronPython.Hosting.Python.CreateEngine(); } PythonCompilerSink sink = new PythonCompilerSink(); - SourceUnit source = DefaultContext.DefaultPythonContext.CreateFileUnit(fileName, fileContent.Text); + SourceUnit source = DefaultContext.DefaultPythonContext.CreateFileUnit(fileName, fileContent); CompilerContext context = new CompilerContext(source, new PythonCompilerOptions(), sink); using (Parser parser = Parser.CreateParser(context, new PythonOptions())) { return parser.ParseFile(false); @@ -92,12 +92,24 @@ namespace ICSharpCode.PythonBinding /// /// Parses the python code and returns an ICompilationUnit. /// - public ICompilationUnit Parse(IProjectContent projectContent, string fileName, string fileContent) + public ICompilationUnit Parse(IProjectContent projectContent, string fileName, ITextBuffer textBuffer) { - return Parse(projectContent, fileName, new StringTextBuffer(fileContent)); + string fileContent = GetFileContent(textBuffer); + return Parse(projectContent, fileName, fileContent); } - public ICompilationUnit Parse(IProjectContent projectContent, string fileName, ITextBuffer fileContent) + string GetFileContent(ITextBuffer textBuffer) + { + if (textBuffer != null) { + return textBuffer.Text; + } + return null; + } + + /// + /// Parses the python code and returns an ICompilationUnit. + /// + public ICompilationUnit Parse(IProjectContent projectContent, string fileName, string fileContent) { if (fileContent != null) { try { @@ -115,9 +127,6 @@ namespace ICSharpCode.PythonBinding return compilationUnit; } - /// - /// Creates a new PythonResolver. - /// public IResolver CreateResolver() { return new PythonResolver(); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs index 3bc88aca4e..daa57b23ce 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs @@ -20,6 +20,7 @@ namespace ICSharpCode.PythonBinding PythonSelfResolver selfResolver = new PythonSelfResolver(); PythonMethodResolver methodResolver; PythonMemberResolver memberResolver; + PythonLocalVariableResolver localVariableResolver = new PythonLocalVariableResolver(); List resolvers = new List(); @@ -35,6 +36,7 @@ namespace ICSharpCode.PythonBinding resolvers.Add(methodResolver); resolvers.Add(selfResolver); resolvers.Add(namespaceResolver); + resolvers.Add(localVariableResolver); } public ResolveResult Resolve(ExpressionResult expressionResult, ParseInformation parseInfo, string fileContent) @@ -43,7 +45,7 @@ namespace ICSharpCode.PythonBinding return null; } - resolverContext = new PythonResolverContext(parseInfo); + resolverContext = new PythonResolverContext(parseInfo, fileContent); if (!resolverContext.GetCallingMember(expressionResult.Region)) { return null; } @@ -59,13 +61,6 @@ namespace ICSharpCode.PythonBinding return resolveResult; } } - -// // Search for a local variable. -// LocalResolveResult localResolveResult = GetLocalVariable(expressionResult.Expression, parseInfo.BestCompilationUnit.FileName, fileContent); -// if (localResolveResult != null) { -// return localResolveResult; -// } - return null; } @@ -74,35 +69,25 @@ namespace ICSharpCode.PythonBinding /// public List CtrlSpace(int caretLine, int caretColumn, ParseInformation parseInfo, string fileContent, ExpressionContext context) { - resolverContext = new PythonResolverContext(parseInfo); + resolverContext = new PythonResolverContext(parseInfo, fileContent); + return CtrlSpace(resolverContext, context); + } + + List CtrlSpace(PythonResolverContext resolverContext, ExpressionContext expressionContext) + { if (resolverContext.HasProjectContent) { - if (context == ExpressionContext.Namespace) { - PythonImportCompletion importCompletion = new PythonImportCompletion(resolverContext.ProjectContent); - return importCompletion.GetCompletionItems(); - } else { - return resolverContext.GetImportedTypes(); + if (expressionContext == ExpressionContext.Namespace) { + return GetImportCompletionItems(resolverContext.ProjectContent); } + return resolverContext.GetImportedTypes(); } return new List(); } - /// - /// Tries to find the type that matches the local variable name. - /// - LocalResolveResult GetLocalVariable(string expression, string fileName, string fileContent) + List GetImportCompletionItems(IProjectContent projectContent) { -// PythonVariableResolver resolver = new PythonVariableResolver(); -// string typeName = resolver.Resolve(expression, fileName, fileContent); -// if (typeName != null) { -// IClass resolvedClass = GetClass(typeName); -// if (resolvedClass != null) { -// DefaultClass dummyClass = new DefaultClass(DefaultCompilationUnit.DummyCompilationUnit, "Global"); -// DefaultMethod dummyMethod = new DefaultMethod(dummyClass, String.Empty); -// DefaultField.LocalVariableField field = new DefaultField.LocalVariableField(resolvedClass.DefaultReturnType, expression, DomRegion.Empty, dummyClass); -// return new LocalResolveResult(dummyMethod, field); -// } -// } - return null; + PythonImportCompletion importCompletion = new PythonImportCompletion(projectContent); + return importCompletion.GetCompletionItems(); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs index 8f85de1d99..76a7cdd799 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs @@ -13,9 +13,16 @@ namespace ICSharpCode.PythonBinding ICompilationUnit compilationUnit; IProjectContent projectContent; IClass callingClass; + string fileContent; public PythonResolverContext(ParseInformation parseInfo) + : this(parseInfo, String.Empty) { + } + + public PythonResolverContext(ParseInformation parseInfo, string fileContent) + { + this.fileContent = fileContent; GetCompilationUnits(parseInfo); GetProjectContent(); } @@ -40,6 +47,10 @@ namespace ICSharpCode.PythonBinding } } + public string FileContent { + get { return fileContent; } + } + public IProjectContent ProjectContent { get { return projectContent; } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index da40fbfda1..07640e3197 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -348,11 +348,11 @@ + - diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs new file mode 100644 index 0000000000..a67afecc5e --- /dev/null +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs @@ -0,0 +1,78 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using ICSharpCode.PythonBinding; +using NUnit.Framework; + +namespace PythonBinding.Tests.Resolver +{ + [TestFixture] + public class PythonLocalVariableResolverTests + { + string typeName; + + void Resolve(string variableName, string code) + { + PythonLocalVariableResolver resolver = new PythonLocalVariableResolver(); + typeName = resolver.Resolve(variableName, code); + } + + [Test] + public void Resolve_InstanceCreatedInCode_ReturnsInstanceType() + { + string code = "a = Class1()"; + Resolve("a", code); + + Assert.AreEqual("Class1", typeName); + } + + /// + /// Tests that the NameExpression in the resolver is reset so the second assignment + /// does not override the first. + /// + [Test] + public void Resolve_TwoInstancesCreatedInCode_ReturnsFirstInstanceType() + { + string code = + "a = Class1()\r\n" + + "b = Class2()"; + + Resolve("a", code); + + Assert.AreEqual("Class1", typeName); + } + + [Test] + public void Resolve_VariableIsAssignedToString_ReturnsNull() + { + string code = "a = \"test\""; + Resolve("a", code); + + Assert.IsNull(typeName); + } + + [Test] + public void Resolve_CodeIsNull_ReturnsNull() + { + Resolve("a", null); + Assert.IsNull(typeName); + } + + [Test] + public void Resolve_InstanceCreatedWithNamespace_ReturnsFullyQualifiedTypeName() + { + string code = "a = Test.Class1()"; + Resolve("a", code); + Assert.AreEqual("Test.Class1", typeName); + } + + [Test] + public void Resolve_InstanceCreatedWithTwoPartsToNamespace_ReturnsFullyQualifiedTypeName() + { + string code = "a = Root.Test.Class1()"; + Resolve("a", code); + Assert.AreEqual("Root.Test.Class1", typeName); + } + } +} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs index c40495cad3..c112ddddb0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassEventTests.cs @@ -53,7 +53,7 @@ namespace PythonBinding.Tests.Resolver { CreateClassWithOneEvent(); resolverHelper.Resolve("MyClass.MyEvent"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(myClassEvent, resolvedMember); } @@ -64,7 +64,7 @@ namespace PythonBinding.Tests.Resolver CreateClassWithOneEvent(); IEvent secondEvent = myClass.AddEvent("SecondEvent"); resolverHelper.Resolve("MyClass.SecondEvent"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(secondEvent, resolvedMember); } @@ -74,7 +74,7 @@ namespace PythonBinding.Tests.Resolver { CreateClassWithOneEvent(); resolverHelper.Resolve("MyClass.MyEvent.Target"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(eventHandlerTargetProperty, resolvedMember); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs index bdc02632a4..d1946ef4c4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassFieldTests.cs @@ -44,7 +44,7 @@ namespace PythonBinding.Tests.Resolver { CreateClassWithOneEvent(); resolverHelper.Resolve("MyClass.MyField"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(myClassField, resolvedMember); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassInstanceWithNamespaceTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassInstanceWithNamespaceTestFixture.cs deleted file mode 100644 index 83f0cb9538..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassInstanceWithNamespaceTestFixture.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; -using NUnit.Framework; -using PythonBinding.Tests; -using PythonBinding.Tests.Utils; - -namespace PythonBinding.Tests.Resolver -{ - /// - /// Given code: - /// - /// a = Test.Class1() - /// - /// Where Test is the namespace of the class, check that the type of "a" can be obtained - /// by the resolver. - /// - [TestFixture] - public class ResolveClassInstanceWithNamespaceTestFixture - { - [Test] - public void GetTypeOfInstance() - { - string code = "a = Test.Class1()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Test.Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void GetTypeOfInstanceWithTwoNamespaces() - { - string code = "a = Root.Test.Class1()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Root.Test.Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs index f710694f91..3efc9c7742 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveClassPropertyTests.cs @@ -54,7 +54,7 @@ namespace PythonBinding.Tests.Resolver { CreateClassWithOneProperty(); resolverHelper.Resolve("MyClass.MyProperty"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(myClassProperty, resolvedMember); } @@ -65,7 +65,7 @@ namespace PythonBinding.Tests.Resolver CreateClassWithOneProperty(); myClass.InsertPropertyAtStart("ExtraProperty"); resolverHelper.Resolve("MyClass.MyProperty"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(myClassProperty, resolvedMember); } @@ -76,7 +76,7 @@ namespace PythonBinding.Tests.Resolver CreateClassWithOneProperty(); AddNestedPropertyToExistingProperty(); resolverHelper.Resolve("MyClass.MyProperty.MyNestedProperty"); - IMember resolvedMember = resolverHelper.MemberResultResult.ResolvedMember; + IMember resolvedMember = resolverHelper.MemberResolveResult.ResolvedMember; Assert.AreEqual(nestedClassProperty, resolvedMember); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs index 3f5a115f94..04cacf214f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs @@ -2,11 +2,7 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Collections; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; -using PythonBinding.Tests; using PythonBinding.Tests.Utils; using UnitTesting.Tests.Utils; @@ -20,82 +16,32 @@ namespace PythonBinding.Tests.Resolver /// Check that the type of "a" can be obtained by the resolver. /// [TestFixture] - [Ignore("Disabled local variable resolution for SD 3.0")] public class ResolveLocalClassInstanceTests { - PythonResolver resolver; - ICSharpCode.Scripting.Tests.Utils.MockProjectContent mockProjectContent; - LocalResolveResult resolveResult; + PythonResolverTestsHelper resolverHelper; MockClass testClass; - ICompilationUnit compilationUnit; - [TestFixtureSetUp] - public void SetUpFixture() + [SetUp] + public void Init() { - resolver = new PythonResolver(); + resolverHelper = new PythonResolverTestsHelper(); - mockProjectContent = new ICSharpCode.Scripting.Tests.Utils.MockProjectContent(); - testClass = new MockClass(mockProjectContent, "Test.Test1"); - mockProjectContent.ClassesInProjectContent.Add(testClass); - mockProjectContent.SetClassToReturnFromGetClass("Test.Test1", testClass); - - compilationUnit = new DefaultCompilationUnit(mockProjectContent); - compilationUnit.FileName = @"C:\Projects\Test\test.py"; - ParseInformation parseInfo = new ParseInformation(compilationUnit); + testClass = resolverHelper.CreateClass("Test.Test1"); + resolverHelper.ProjectContent.ClassesInProjectContent.Add(testClass); + resolverHelper.ProjectContent.SetClassToReturnFromGetClass("Test.Test1", testClass); string python = - "a = Test1()\r\n" + + "a = Test.Test1()\r\n" + "a"; - ExpressionResult expressionResult = new ExpressionResult("a", new DomRegion(2, 1), null, null); - resolveResult = resolver.Resolve(expressionResult, parseInfo, python) as LocalResolveResult; - } - - [Test] - public void GetTypeOfInstance() - { - string code = "a = Class1()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - /// - /// Tests that the NameExpression in the resolver is reset so the second assignment - /// does not override the first. - /// - [Test] - public void DifferentTypeCreatedLast() - { - string code = "a = Class1()\r\n" + - "b = Class2()"; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual("Class1", resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void StringAssignmentShouldNotResolve() - { - string code = "a = \"test\""; - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", code)); - } - - [Test] - public void NullCodeShouldNotResolve() - { - PythonVariableResolver resolver = new PythonVariableResolver(); - Assert.AreEqual(null, resolver.Resolve("a", @"C:\Projects\Test\Test.py", null)); - } - - [Test] - public void ResolveResultIsLocalResolveResult() - { - Assert.IsNotNull(resolveResult); + + resolverHelper.Resolve("a", python); } [Test] public void ResolveResultVariableName() { - Assert.AreEqual(resolveResult.VariableName, "a"); + string name = resolverHelper.LocalResolveResult.VariableName; + Assert.AreEqual("a", name); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs index 51eb76f5f9..dcad496a05 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs @@ -14,7 +14,6 @@ namespace PythonBinding.Tests.Utils public ScriptingUtils.MockProjectContent ProjectContent; public DefaultCompilationUnit CompilationUnit; public ParseInformation ParseInfo; - public PythonResolverContext Context; public PythonResolver Resolver; public ResolveResult ResolveResult; @@ -25,9 +24,7 @@ namespace PythonBinding.Tests.Utils string fileName = @"test.py"; CompilationUnit = parser.Parse(ProjectContent, fileName, code) as DefaultCompilationUnit; - ParseInfo = new ParseInformation(CompilationUnit); - Context = new PythonResolverContext(ParseInfo); - + ParseInfo = new ParseInformation(CompilationUnit); Resolver = new PythonResolver(); } @@ -39,14 +36,26 @@ namespace PythonBinding.Tests.Utils public ResolveResult Resolve(string expression) { ExpressionResult expressionResult = new ExpressionResult(expression); - ResolveResult = Resolver.Resolve(Context, expressionResult); + PythonResolverContext context = new PythonResolverContext(ParseInfo); + ResolveResult = Resolver.Resolve(context, expressionResult); + return ResolveResult; + } + + public ResolveResult Resolve(string expression, string code) + { + ExpressionResult expressionResult = new ExpressionResult(expression); + ResolveResult = Resolver.Resolve(expressionResult, ParseInfo, code); return ResolveResult; } - public MemberResolveResult MemberResultResult { + public MemberResolveResult MemberResolveResult { get { return ResolveResult as MemberResolveResult; } } + public LocalResolveResult LocalResolveResult { + get { return ResolveResult as LocalResolveResult; } + } + public MockClass CreateClass(string name) { return new MockClass(ProjectContent, name); From 5cce1f4d57b32b6611df17c5801102d380f53d2f Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Fri, 24 Sep 2010 07:20:28 +0200 Subject: [PATCH 15/33] Beta 3 designation for setup --- src/Setup/Setup.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 5ebf109127..304d900237 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -8,7 +8,7 @@ --> Date: Fri, 24 Sep 2010 11:37:14 +0100 Subject: [PATCH 16/33] Fix potential infinite loop in IronPython local variable resolver. --- .../Python/PyWalker/NRefactoryAstVisitor.cs | 5 ---- .../Python/PyWalker/PyWalker.csproj | 4 +-- .../BackendBindings/Python/PythonBinding.sln | 10 +++++++ .../Src/PythonLocalVariableResolver.cs | 30 ++++--------------- .../PythonLocalVariableResolverTests.cs | 11 +++++++ 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PyWalker/NRefactoryAstVisitor.cs b/src/AddIns/BackendBindings/Python/PyWalker/NRefactoryAstVisitor.cs index 99682c80bd..7d15662650 100644 --- a/src/AddIns/BackendBindings/Python/PyWalker/NRefactoryAstVisitor.cs +++ b/src/AddIns/BackendBindings/Python/PyWalker/NRefactoryAstVisitor.cs @@ -278,11 +278,6 @@ namespace PyWalker return base.VisitIfElseStatement(ifElseStatement, data); } - public override object VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration, object data) - { - return base.VisitIndexerDeclaration(indexerDeclaration, data); - } - public override object VisitIndexerExpression(IndexerExpression indexerExpression, object data) { return base.VisitIndexerExpression(indexerExpression, data); diff --git a/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj b/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj index 71f993685b..50c0c251a6 100644 --- a/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj +++ b/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj @@ -1,5 +1,5 @@  - + {55329704-6046-48EC-8A20-5C80B3092A63} Debug @@ -7,7 +7,7 @@ WinExe PyWalker PyWalker - v3.5 + v4.0 False False 4 diff --git a/src/AddIns/BackendBindings/Python/PythonBinding.sln b/src/AddIns/BackendBindings/Python/PythonBinding.sln index 7676dba062..9f4db98c7a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding.sln +++ b/src/AddIns/BackendBindings/Python/PythonBinding.sln @@ -38,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", ".. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "..\Scripting\Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PyWalker", "PyWalker\PyWalker.csproj", "{55329704-6046-48EC-8A20-5C80B3092A63}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -128,5 +130,13 @@ Global {85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.ActiveCfg = Release|x86 {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.Build.0 = Release|x86 {85C09AD8-183B-403A-869A-7226646218A9}.Release|x86.ActiveCfg = Release|x86 + {55329704-6046-48EC-8A20-5C80B3092A63}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Debug|x86.Build.0 = Debug|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Debug|x86.ActiveCfg = Debug|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Release|Any CPU.Build.0 = Release|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Release|x86.Build.0 = Release|Any CPU + {55329704-6046-48EC-8A20-5C80B3092A63}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs index 9479733afa..f9d148dce6 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs @@ -105,33 +105,13 @@ namespace ICSharpCode.PythonBinding /// /// then the expression will be a name expression referring to Class1. /// - static string GetTypeName(Expression node) + public static string GetTypeName(Expression node) { - // Collect the names that make up the type name. - NameExpression nameExpression = null; - List names = new List(); - do { - nameExpression = node as NameExpression; - MemberExpression memberExpression = node as MemberExpression; - string name = String.Empty; - if (memberExpression != null) { - name = memberExpression.Name; - node = memberExpression.Target; - } else if (nameExpression != null) { - name = nameExpression.Name; - } - names.Add(name); - } while (nameExpression == null); - - // Create the fully qualified type name by adding the names - // in reverse order. - StringBuilder typeName = new StringBuilder(); - typeName.Append(names[names.Count - 1]); - for (int i = names.Count - 2; i >= 0; --i) { - typeName.Append('.'); - typeName.Append(names[i]); + NameExpression nameExpression = node as NameExpression; + if (nameExpression != null) { + return nameExpression.Name; } - return typeName.ToString(); + return PythonControlFieldExpression.GetMemberName(node as MemberExpression); } public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs index a67afecc5e..9977ebf536 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs @@ -3,7 +3,9 @@ using System; using ICSharpCode.PythonBinding; +using IronPython.Compiler.Ast; using NUnit.Framework; +using PythonBinding.Tests.Utils; namespace PythonBinding.Tests.Resolver { @@ -74,5 +76,14 @@ namespace PythonBinding.Tests.Resolver Resolve("a", code); Assert.AreEqual("Root.Test.Class1", typeName); } + + [Test] + public void GetTypeName_ExpressionIsNotNameOrMemberExpression_ReturnsEmptyStringAndDoesNotGetStuckInInfiniteLoop() + { + AssignmentStatement statement = PythonParserHelper.GetAssignmentStatement("a = 2"); + Expression expression = statement.Right; + string typeName = PythonLocalVariableResolver.GetTypeName(expression); + Assert.AreEqual(String.Empty, typeName); + } } } From 240cd451be51c81b7a1d94da3f7eab2571f3718b Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 21 Sep 2010 22:29:00 +0200 Subject: [PATCH 17/33] Update file headers. --- .../Utils/PythonCodeDomSerializerHelper.cs | 8 ++---- .../Test/Utils/PythonComponentWalkerHelper.cs | 8 ++---- .../Test/Utils/RubyCodeDomSerializerHelper.cs | 8 ++---- .../Test/Utils/RubyComponentWalkerHelper.cs | 8 ++---- .../Scripting/Project/Src/IComponentWalker.cs | 8 ++---- .../Src/IScriptingCodeDomSerializer.cs | 8 ++---- .../Project/Src/IScriptingConsoleHost.cs | 8 ++---- .../Src/IScriptingDesignerGenerator.cs | 8 ++---- .../Project/Src/ScriptingCodeBuilder.cs | 8 ++---- .../Project/Src/ScriptingDesignerGenerator.cs | 8 ++---- .../Scripting/Project/Src/ScriptingStyle.cs | 8 ++---- .../Project/Src/ScriptingWorkbench.cs | 8 ++---- .../Src/ThreadSafeScriptingConsoleEvents.cs | 8 ++---- ...eysPressedWhenCompletionWindowOpenTests.cs | 8 ++---- .../SendToScriptingConsoleCommandTestsBase.cs | 8 ++---- .../Test/Designer/CallBeginInitOnLoadTests.cs | 8 ++---- .../GenerateAcceptButtonFormTestsBase.cs | 8 ++---- .../Designer/GenerateDesignerCodeTestsBase.cs | 8 ++---- ...EnabledUsingPropertyDescriptorTestsBase.cs | 8 ++---- ...erControlWithNullPropertyValueTestsBase.cs | 8 ++---- .../Designer/ScriptingCodeBuilderTests.cs | 8 ++---- .../ScriptingDesignerGeneratorTests.cs | 8 ++---- .../Designer/ScriptingDesignerLoaderTests.cs | 8 ++---- .../Test/Utils/CustomClassTypeConverter.cs | 8 ++---- .../Test/Utils/FakeCodeDomSerializer.cs | 8 ++---- .../Test/Utils/FakeComponentWalker.cs | 8 ++---- .../Utils/FakeDesignerSerializationManager.cs | 8 ++---- .../Test/Utils/MSBuildEngineHelper.cs | 8 ++---- .../TestableScriptingDesignerGenerator.cs | 8 ++---- .../Utils/TestableScriptingDesignerLoader.cs | 8 ++---- ...estableThreadSafeScriptingConsoleEvents.cs | 8 ++---- ...TestableScriptingDesignerGeneratorTests.cs | 8 ++---- .../Project/Commands/ExplorerCommands.cs | 12 +++------ .../Project/Commands/FormsCommand.cs | 10 ++------ .../Project/Commands/PreviewCommands.cs | 10 ++------ .../Project/Commands/ViewCommands.cs | 11 +++----- .../Project/Configuration/AssemblyInfo.cs | 8 ++---- .../Project/Designer/DataItemDesigner.cs | 10 ++------ .../Project/Designer/DesignerHelper.cs | 10 ++------ .../Project/Designer/DragObject.cs | 10 ++------ .../Project/Designer/GroupeHeaderDesigner.cs | 10 ++------ .../Project/Designer/GroupedRowDesigner.cs | 11 +++----- .../Project/Designer/ImageDesigner.cs | 13 +++------- .../Project/Designer/LineDesigner.cs | 10 ++------ .../RootDesigner/ReportItemsContainer.cs | 10 ++------ .../RootDesigner/ReportRootDesigner.cs | 10 ++------ .../Project/Designer/RowItemDesigner.cs | 11 +++----- .../Project/Designer/Ruler.cs | 9 ++----- .../Project/Designer/SectionDesigner.cs | 10 ++------ .../Project/Designer/ShapeDesigner.cs | 12 +++------ .../Project/Designer/SmartTagTransactions.cs | 11 +++----- .../Project/Designer/TableDesigner.cs | 13 +++------- .../Designer/TextBasedDesignerActionList.cs | 11 +++----- .../Project/Designer/TextItemDesigner.cs | 10 ++------ .../DesignerBinding/IDesignerGenerator.cs | 11 +++----- .../DesignerBinding/InternalReportLoader.cs | 11 +++----- .../ReportDefinitionDeserializer.cs | 3 +++ .../ReportDesignerDisplayBinding.cs | 10 ++------ .../ReportDesignerGenerator.cs | 10 ++------ .../DesignerBinding/ReportDesignerLoader.cs | 4 ++- .../Dialogs/ExpressionEditor.Designer.cs | 11 +++----- .../Project/Dialogs/ExpressionEditor.cs | 11 +++----- .../Globals/FormsDesignerLoadException.cs | 11 +++----- .../Project/Globals/GlobalsDesigner.cs | 11 +++----- .../Globals/StringWriterWithEncoding.cs | 11 +++----- .../Project/ReportDesignerView.cs | 11 +++----- .../Project/ReportExplorer/ExplorerNodes.cs | 11 +++----- .../Project/ReportExplorer/ExplorerTree.cs | 8 ++---- .../ReportExplorer/ReportExplorerPad.cs | 8 ++---- .../Project/ReportItems/AbstractItem.cs | 10 ++------ .../Project/ReportItems/BaseCircleItem.cs | 11 ++------ .../Project/ReportItems/BaseDataItem.cs | 10 ++------ .../Project/ReportItems/BaseGroupItem.cs | 11 +++----- .../Project/ReportItems/BaseGroupedRow.cs | 11 +++----- .../Project/ReportItems/BaseImageItem.cs | 10 ++------ .../Project/ReportItems/BaseLine.cs | 10 ++------ .../Project/ReportItems/BaseRectangleItem.cs | 10 ++------ .../Project/ReportItems/BaseRowItem.cs | 10 ++------ .../Project/ReportItems/BaseSection.cs | 10 ++------ .../Project/ReportItems/BaseTableItem.cs | 11 +++----- .../Project/ReportItems/BaseTextItem.cs | 10 ++------ .../Project/ReportItems/ErrorItem.cs | 10 ++------ .../ReportItems/RectangleItemTypeProvider.cs | 11 +++----- .../Project/ReportManagers/BaseManager.cs | 10 ++------ .../ReportManagers/StandartPreviewManager.cs | 11 +++----- .../Generators/AbstractReportGenerator.cs | 11 ++------ .../Generators/GenerateFormSheetReport.cs | 8 ++---- .../Generators/GeneratePlainReport.cs | 10 ++------ .../Generators/GeneratePullDataReport.cs | 11 +++----- .../Generators/GeneratePushDataReport.cs | 9 ++----- .../Generators/GeneratorFactory.cs | 11 +++----- .../ReportWizard/Generators/WizardHelper.cs | 12 +++------ .../ReportLayout/AbstractLayout.cs | 10 ++------ .../ReportWizard/ReportLayout/ListLayout.cs | 9 +++---- .../ReportWizard/ReportLayout/TableLayout.cs | 11 +++----- .../Project/ReportWizard/ReportStructure.cs | 8 ++---- .../ReportWizard/ReportWizardCommand.cs | 11 +++----- .../Project/ReportWizard/WizardCommands.cs | 11 +++----- .../WizardPanels/BaseSettingsPanel.cs | 8 ++---- .../DataGridViewColumnHeaderCheckBoxCell.cs | 12 +++------ .../ReportWizard/WizardPanels/LayoutPanel.cs | 11 +++----- .../LayoutPanelControl.Designer.cs | 11 +++----- .../WizardPanels/LayoutPanelControl.cs | 11 +++----- .../WizardPanels/PullModelPanel.cs | 9 ++----- .../WizardPanels/PushModelPanel.cs | 8 ++---- .../ReportWizard/WizardPanels/ResultPanel.cs | 10 ++------ .../Wizard/AbstractOptionPanel.cs | 8 ++---- .../Wizard/AbstractWizardPanel.cs | 8 ++---- .../WizardPanels/Wizard/CurrentPanelPanel.cs | 8 ++---- .../Wizard/DefaultDialogPanelDescriptor.cs | 8 ++---- .../WizardPanels/Wizard/DialogPanelDoozer.cs | 8 ++---- .../WizardPanels/Wizard/IDialogPanel.cs | 8 ++---- .../Wizard/IDialogPanelDescriptor.cs | 8 ++---- .../WizardPanels/Wizard/IWizardPanel.cs | 8 ++---- .../WizardPanels/Wizard/StatusPanel.cs | 8 ++---- .../WizardPanels/Wizard/WizardDialog.cs | 8 ++---- .../Project/SecondaryViews/ReportPreview.cs | 11 +++----- .../SecondaryViews/ReportViewerMessages.cs | 11 +++----- .../ReportViewerSecondaryView.cs | 10 ++------ .../Project/SecondaryViews/XmlView.cs | 11 +++----- .../DefaultMemberRelationshipService.cs | 13 +++------- .../Services/DefaultServiceContainer.cs | 9 ++----- .../Services/DesignerSerializationService.cs | 10 ++------ .../Project/Services/HelpService.cs | 8 ++---- .../Project/Services/MenuCommandService.cs | 12 +++------ .../Project/Services/NameCreationService.cs | 10 ++------ .../Project/Services/ToolboxService.cs | 10 ++------ .../Project/Services/TypeDiscoveryService.cs | 8 ++---- .../Project/Services/TypeResolutionService.cs | 8 ++---- .../Project/Services/UIService.cs | 8 ++---- .../Project/Toolbox/SideTabItemDesigner.cs | 8 ++---- .../Project/Toolbox/ToolboxProvider.cs | 10 ++------ .../Project/UndoRedo/UndoEngine.cs | 8 ++---- .../Project/Xml/MycroWriter.cs | 10 ++------ .../Project/Xml/ReportDefinitionParser.cs | 11 ++------ .../Project/Xml/ReportDesignerWriter.cs | 12 +++------ .../Project/Xml/XmlHelper.cs | 12 +++------ .../Test/AssemblyInfo.cs | 3 +++ .../DerivedReportDesignerDisplayBinding.cs | 11 +++----- .../Test/Designer/MockDesignerGenerator.cs | 10 ++------ .../Test/Designer/MockOpenedFile.cs | 8 ++---- .../MockReportDesignerDisplayBinding.cs | 10 ++------ .../Test/Designer/MockViewContend.cs | 11 +++----- ...ReportDesignerDisplayBindingTestFixture.cs | 12 +++------ .../ReportDesignerLoaderTestFixture.cs | 10 ++------ .../Test/Dialogs/DummyEditorDialog.cs | 10 ++------ .../Test/Dialogs/TextEditorDialogFixture.cs | 10 ++------ .../Test/MeasurementServiceFixture.cs | 10 ++------ .../Wizard/GeneratePlainReportFixture_1.cs | 10 ++------ .../Generators/GenarateListReportFixture.cs | 10 ++------ .../Generators/GenerateFormsSheetReport.cs | 10 ++------ .../GenerateListWithGroupFixture.cs | 11 +++----- .../GeneratePlainReportFixture_2.cs | 10 ++------ .../Generators/GenerateTableReportFixture.cs | 10 ++------ .../Generators/GeneratorFactoryFixture.cs | 10 ++------ .../Generators/ReportGenerationHelper.cs | 11 +++----- .../Test/Wizard/ReportStructureFixture.cs | 10 ++------ .../Project/BaseClasses/AbstractColumn.cs | 8 ++---- .../Project/BaseClasses/BasicParameter.cs | 8 ++---- .../Project/BaseClasses/CurrentItem.cs | 10 ++------ .../Project/BaseClasses/GroupColumn.cs | 9 +++---- .../Project/BaseClasses/Printing/Layouter.cs | 11 +++----- .../Printing/MeasurementService.cs | 8 ++---- .../BaseClasses/Printing/PrintHelper.cs | 10 ++------ .../BaseClasses/Printing/StandardFormatter.cs | 9 ++----- .../BaseClasses/Printing/StandardPrinter.cs | 11 +++----- .../BaseClasses/Printing/TextDrawer.cs | 8 ++---- .../Project/BaseClasses/SectionBounds.cs | 8 ++---- .../Project/BaseClasses/SinglePage.cs | 11 +++----- .../Project/BaseClasses/SortColumn.cs | 25 ++++--------------- .../Project/BaseClasses/SqlParameter.cs | 9 +++---- .../Project/BaseItems/BaseDataItem.cs | 8 ++---- .../Project/BaseItems/BaseGraphicItem.cs | 8 ++---- .../Project/BaseItems/BaseGroupItem.cs | 11 +++----- .../Project/BaseItems/BaseGroupedRow.cs | 11 +++----- .../Project/BaseItems/BaseReportItem.cs | 9 ++----- .../Project/BaseItems/BaseRowItem.cs | 10 ++------ .../Project/BaseItems/BaseSection.cs | 9 ++----- .../Project/BaseItems/BaseTableItem.cs | 8 ++---- .../Project/BaseItems/BaseTextItem.cs | 9 ++----- .../Project/BaseItems/ErrorItem.cs | 10 ++------ .../BaseItems/Graphics/BaseCircleItem.cs | 8 ++---- .../BaseItems/Graphics/BaseImageItem.cs | 8 ++---- .../BaseItems/Graphics/BaseLineItem.cs | 8 ++---- .../BaseItems/Graphics/BaseRectangleItem.cs | 8 ++---- .../Project/BaseItems/IDataItem.cs | 8 ++---- .../Project/BaseItems/IExpression.cs | 11 +++----- .../Project/Collections/Collections.cs | 8 ++---- .../Project/Configuration/AssemblyInfo.cs | 8 ++---- .../Project/ConnectionObject.cs | 8 ++---- .../Project/DataManager/ChildNavigator.cs | 11 +++----- .../DataManager/Comparer/BaseComparer.cs | 8 ++---- .../DataManager/Comparer/GroupSeparator.cs | 8 ++---- .../DataManager/Comparer/SortComparer.cs | 8 ++---- .../Project/DataManager/DataManager.cs | 8 ++---- .../Project/DataManager/DataNavigator.cs | 8 ++---- .../ExtendedPropertyDescriptor.cs | 8 ++---- .../ListHandling/ExtendedTypeDescriptor.cs | 8 ++---- .../DataManager/ListHandling/IndexList.cs | 8 ++---- .../ListHandling/PropertyTypeHash.cs | 8 ++---- .../ListStrategy/BaseListStrategy.cs | 8 ++---- .../ListStrategy/CollectionStrategy.cs | 14 ++++------- .../DataManager/ListStrategy/TableStrategy.cs | 11 +++----- .../Project/DataManager/SqlDataAccess.cs | 11 +++----- .../Project/DataManager/SqlQueryChecker.cs | 8 ++---- .../Project/Dialogs/DefaultTextEditor.cs | 10 ++------ .../Project/Dialogs/EditorDialog.Designer.cs | 11 +++----- .../Project/Dialogs/EditorDialog.cs | 10 ++------ .../Dialogs/GroupingCollectionEditor.cs | 11 +++----- .../Project/Dialogs/ParameterDialog.cs | 12 ++------- .../Dialogs/ParametersCollectionEditor.cs | 11 +++----- .../Project/Dialogs/PreviewControl.cs | 8 ++---- .../Dialogs/SortingCollectionEditor.cs | 11 +++----- .../Project/Events/EventHelper.cs | 8 ++---- .../Project/Events/GroupChangedEventArgs.cs | 8 ++---- .../Project/Events/NewPageEventArgs.cs | 11 +++----- .../Project/Events/PrintEventArgs.cs | 8 ++---- .../Project/Events/ReportPageEventArgs.cs | 8 ++---- .../Events/ReportParametersEventArgs.cs | 8 ++---- .../Project/Events/SectionRenderEventArgs.cs | 8 ++---- .../Exceptions/FieldNotFoundException.cs | 11 +++----- .../Project/Exceptions/GroupLevelException.cs | 10 ++------ .../Project/Exceptions/IllegalFileFormat.cs | 8 ++---- .../Exceptions/IllegalQueryException.cs | 8 ++---- .../Exceptions/InvalidReportModelException.cs | 8 ++---- .../Exceptions/MissingDataManagerException.cs | 8 ++---- .../Exceptions/MissingDataSourceException.cs | 8 ++---- .../Exceptions/MissingModelException.cs | 8 ++---- .../Exceptions/MissingParentException.cs | 11 +++----- .../Exceptions/MissingSectionException.cs | 8 ++---- .../Project/Exceptions/ReportException.cs | 8 ++---- .../Exceptions/UnknownFunctionException.cs | 11 +++----- .../Exceptions/UnknownItemException.cs | 10 ++------ .../Exceptions/WrongColumnException.cs | 10 ++------ .../Exceptions/WrongSectionException.cs | 11 +++----- .../Project/Exporter/BasePager.cs | 11 ++------ .../Exporter/Converters/BaseConverter.cs | 11 +++----- .../Exporter/Converters/ConverterFactory.cs | 11 +++----- .../Converters/GroupedRowConverter.cs | 11 +++----- .../Exporter/Converters/TableConverter.cs | 11 +++----- .../Project/Exporter/DataPageBuilder.cs | 8 ++---- .../Exporter/Decorators/BaseStyleDecorator.cs | 8 ++---- .../Decorators/GraphicStyleDecorator.cs | 8 ++---- .../Decorators/IBaseStyleDecorator.cs | 8 ++---- .../Exporter/Decorators/ILineDecorator.cs | 12 ++------- .../Exporter/Decorators/Linedecorator.cs | 12 ++------- .../Exporter/Decorators/TextStyleDecorator.cs | 8 ++---- .../ExportColumns/BaseExportColumn.cs | 8 ++---- .../Exporter/ExportColumns/ExportContainer.cs | 8 ++---- .../Exporter/ExportColumns/ExportGraphic.cs | 8 ++---- .../Exporter/ExportColumns/ExportImage.cs | 8 ++---- .../Exporter/ExportColumns/ExportText.cs | 8 ++---- .../ExportColumns/IExportColumnBuilder .cs | 8 ++---- .../ExportColumns/IExportContainer.cs | 8 ++---- .../ExportRenderer/BaseExportRenderer.cs | 8 ++---- .../Exporter/ExportRenderer/HTMLRenderer.cs | 10 ++------ .../Exporter/ExportRenderer/PdfRenderer.cs | 10 ++------ .../ExportRenderer/PreviewRenderer.cs | 8 ++---- .../Exporter/ExportRenderer/PrintRenderer.cs | 8 ++---- .../Exporter/ExportRenderer/XPSRenderer.cs | 10 ++------ .../Project/Exporter/ExporterPage.cs | 8 ++---- .../Project/Exporter/FormPageBuilder.cs | 10 ++------ .../Project/Exporter/PageEventArgs.cs | 8 ++---- .../Expressions/ExpressionEvaluatorFacade.cs | 11 +++----- .../Expressions/IExpressionEvaluatorFacade.cs | 11 +++----- .../ReportingLanguage/ReportingLanguage.cs | 11 +++----- .../ReportingLanguageCompiler.cs | 11 +++----- .../SimpleExpressionEvaluator.cs | 5 +++- .../SimpleExpressionLanguageCompiler.cs | 7 ++++-- .../Factories/ConnectionObjectFactory.cs | 8 ++---- .../Project/Factories/DataManagerFacrory.cs | 11 +++----- .../Project/Factories/DisplayNameAttribute.cs | 8 ++---- .../Project/Factories/RendererFactory.cs | 8 ++---- .../Project/Factories/SectionFactory.cs | 8 ++---- .../Project/Globals/CreateGraphicObject.cs | 11 +++----- .../Project/Globals/FilePathConverter.cs | 10 ++------ .../Project/Globals/FileUtility.cs | 8 ++---- .../Project/Globals/FontCache.cs | 11 +++----- .../Project/Globals/GlobalEnums.cs | 8 ++---- .../Project/Globals/GlobalLists.cs | 11 +++----- .../Project/Globals/GlobalValues.cs | 10 +++----- .../Project/Globals/PdfHelper.cs | 10 ++------ .../Project/Globals/ReportSectionNames.cs | 11 +++----- .../Project/IReportCreator.cs | 10 ++------ .../Project/Interfaces/IContainerItem.cs | 8 ++---- .../Project/Interfaces/IDataAccessStrategy.cs | 11 +++----- .../Project/Interfaces/IDataNavigator.cs | 8 ++---- .../Project/Interfaces/IDataViewStrategy.cs | 8 ++---- .../Interfaces/IHierarchyInterfaces.cs | 8 ++---- .../Project/Interfaces/IItemConverter.cs | 11 +++----- .../Project/Interfaces/ILayouter.cs | 13 +++------- .../Project/Interfaces/IMeasurementService.cs | 11 +++----- .../Project/Interfaces/IReportItem.cs | 8 ++---- .../Project/Interfaces/IReportModel.cs | 11 +++----- .../Project/Interfaces/ISinglePage.cs | 10 ++------ .../Project/Printing/AbstractDataRenderer.cs | 10 ++------ .../Project/Printing/AbstractRenderer.cs | 11 ++------ .../Printing/ExtendedPrintController.cs | 11 +++----- .../Project/Printing/Graphics/BaseLine.cs | 9 ++----- .../Project/Printing/Graphics/BaseShape.cs | 9 ++----- .../Project/Printing/Graphics/Border.cs | 8 ++---- .../Project/Printing/Graphics/EllipseShape.cs | 9 +++---- .../Project/Printing/Graphics/FillPatterns.cs | 9 ++----- .../Project/Printing/Graphics/LineShape.cs | 9 ++----- .../Printing/Graphics/RectangleShape.cs | 9 ++----- .../Project/Printing/RenderDataReport.cs | 10 ++------ .../Project/Printing/RenderFormSheetReport.cs | 9 ++----- .../Project/Printing/ReportDocument.cs | 8 ++---- .../Project/ReportEngine.cs | 9 ++----- .../Project/ReportModel.cs | 8 ++---- .../Project/ReportParameters.cs | 8 ++---- .../Project/ReportSettings.cs | 10 ++------ .../ReportViewer/IReportViewerMessages.cs | 8 ++---- .../ReportViewer/NumericToolStripTextBox.cs | 8 ++---- .../ReportViewer/PageNavigationEventArgs.cs | 8 ++---- .../ReportViewer/ReportViewer.Designer.cs | 11 +++----- .../Project/ReportViewer/ReportViewer.cs | 8 ++---- .../Project/Xml/BaseItemLoader.cs | 10 ++------ .../Project/Xml/MycroParser.cs | 11 ++------ .../Project/Xml/MycroWriter.cs | 10 ++------ .../BaseClasses/AbstractColumnFixture.cs | 10 ++------ .../BaseClasses/GroupColumnFixture.cs | 10 ++------ .../BaseClasses/Parameters.cs | 10 ++------ .../BaseClasses/SortColumnFixture.cs | 10 ++------ .../BaseItems/BaseDataItemFixture.cs | 10 ++------ .../BaseItems/BaseGraphicItemFixture.cs | 10 ++------ .../BaseItems/BaseReportItemFixture.cs | 10 ++------ .../BaseItems/BaseRowItemFixture.cs | 10 ++------ .../BaseItems/BaseSectionFixture.cs | 10 ++------ .../BaseItems/BaseTextItemFixture.cs | 10 ++------ .../Collections/AvailableFieldsCollection.cs | 10 ++------ .../Collections/ColumnCollectionFixture.cs | 10 ++------ .../ParametersCollectionFixture.cs | 10 ++------ .../ReportItemCollectionFixture.cs | 10 ++------ .../DataManager/GroupListFixture.cs | 10 ++------ .../DataManager/GroupTableFixture.cs | 10 ++------ .../IConnectionDataManagerFixture.cs | 10 ++------ .../DataManager/IListDataManagerFixture.cs | 10 ++------ .../DataManager/MockDataAccess.cs | 13 +++------- .../Strategy/TableStrategyFixture.cs | 10 ++------ .../DataManager/TableDataManagerFixture.cs | 10 ++------ .../Printing/SectionBoundFixture.cs | 10 ++------ .../Printing/Shapes/BaseLineFixture.cs | 10 ++------ .../Printing/Shapes/EllipseShapeFixture.cs | 10 ++------ .../Printing/Shapes/LineShapeFixture.cs | 10 ++------ .../Printing/Shapes/RectangleShapeFixture.cs | 10 ++------ .../Printing/SinglePageFixture.cs | 10 ++------ .../Properties/AssemblyInfo.cs | 5 +++- .../ReportModelFixture.cs | 10 ++------ .../ReportSettings/ReportSettingsFixture.cs | 10 ++------ .../ExpressionEvaluatorFixture.cs | 10 ++------ .../ReportingLanguage/FunctionsFixture.cs | 10 ++------ .../AggregateFunctionsFixture.cs | 10 ++------ .../AggregateFunctionsFromIListFixture.cs | 10 ++------ .../IntegrationTests/ConcatFieldsFixture.cs | 10 ++------ .../IntegrationTests/FieldReferenceFixture.cs | 10 ++------ .../IntegrationTests/GlobalFunctions.cs | 10 ++------ .../IntegrationTests/SimpleCompilerFixture.cs | 10 ++------ .../IntegrationTests/UserFunctionsFixture.cs | 10 ++------ .../AggregateFunctionsFixture.cs | 10 ++------ .../LanguageTests/ConditionalFixture.cs | 12 +++------ .../LanguageTests/PropertyEvaluator.cs | 10 ++------ .../LanguageTests/SimpleCompilerFixture.cs | 10 ++------ .../LanguageTests/SimpleMath.cs | 11 +++----- .../LanguageTests/StringConcat.cs | 10 ++------ .../ReportingLanguage/TestHelper.cs | 11 +++----- .../TestHelpers/AggregateFuctionHelper.cs | 11 +++----- .../TestHelpers/ConcernOf.cs | 11 +++----- .../TestHelpers/ContributorsList.cs | 11 +++----- 369 files changed, 853 insertions(+), 2657 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonCodeDomSerializerHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonCodeDomSerializerHelper.cs index 48d6e8a7e7..f4f9f75286 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonCodeDomSerializerHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonCodeDomSerializerHelper.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.PythonBinding; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonComponentWalkerHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonComponentWalkerHelper.cs index 581559451a..96e37ee925 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonComponentWalkerHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonComponentWalkerHelper.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.PythonBinding; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyCodeDomSerializerHelper.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyCodeDomSerializerHelper.cs index 735247de4e..03aab6fa87 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyCodeDomSerializerHelper.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyCodeDomSerializerHelper.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.RubyBinding; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyComponentWalkerHelper.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyComponentWalkerHelper.cs index e0b90ea0d8..44628f8e70 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyComponentWalkerHelper.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/RubyComponentWalkerHelper.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.RubyBinding; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/IComponentWalker.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IComponentWalker.cs index b4fc99d22e..1b6aaa4148 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/IComponentWalker.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IComponentWalker.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingCodeDomSerializer.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingCodeDomSerializer.cs index a7888e04c2..ef04a4709d 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingCodeDomSerializer.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingCodeDomSerializer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel.Design; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingConsoleHost.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingConsoleHost.cs index d8989d6b14..6625eb4f81 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingConsoleHost.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingConsoleHost.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingDesignerGenerator.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingDesignerGenerator.cs index 07d7fbe280..0e39bee1d1 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/IScriptingDesignerGenerator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel.Design; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCodeBuilder.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCodeBuilder.cs index 96c3b9e394..f0feee2c76 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCodeBuilder.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCodeBuilder.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Text; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs index 736fb449c4..e6a373e319 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.CodeDom; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingStyle.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingStyle.cs index c8852765fb..4ffc1e8f38 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingStyle.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingStyle.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingWorkbench.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingWorkbench.cs index b79421c8a0..56fe8eb4cc 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingWorkbench.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingWorkbench.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.SharpDevelop; diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ThreadSafeScriptingConsoleEvents.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ThreadSafeScriptingConsoleEvents.cs index 54f7900f8b..5efe117b7a 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ThreadSafeScriptingConsoleEvents.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ThreadSafeScriptingConsoleEvents.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Threading; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Console/KeysPressedWhenCompletionWindowOpenTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Console/KeysPressedWhenCompletionWindowOpenTests.cs index 841be8af0c..ecf530636a 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Console/KeysPressedWhenCompletionWindowOpenTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Console/KeysPressedWhenCompletionWindowOpenTests.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Input; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Console/SendToScriptingConsoleCommandTestsBase.cs b/src/AddIns/BackendBindings/Scripting/Test/Console/SendToScriptingConsoleCommandTestsBase.cs index 25cf2491da..58716e2f33 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Console/SendToScriptingConsoleCommandTestsBase.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Console/SendToScriptingConsoleCommandTestsBase.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Scripting.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/CallBeginInitOnLoadTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/CallBeginInitOnLoadTests.cs index 9a61581a5d..6db599160e 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/CallBeginInitOnLoadTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/CallBeginInitOnLoadTests.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Scripting.Tests.Utils; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateAcceptButtonFormTestsBase.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateAcceptButtonFormTestsBase.cs index 88c395645d..464bab7e30 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateAcceptButtonFormTestsBase.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateAcceptButtonFormTestsBase.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateDesignerCodeTestsBase.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateDesignerCodeTestsBase.cs index a64ab22ccb..4f6067372c 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateDesignerCodeTestsBase.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateDesignerCodeTestsBase.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateEnabledUsingPropertyDescriptorTestsBase.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateEnabledUsingPropertyDescriptorTestsBase.cs index 08f41839eb..82a0fab1b9 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateEnabledUsingPropertyDescriptorTestsBase.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateEnabledUsingPropertyDescriptorTestsBase.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateUserControlWithNullPropertyValueTestsBase.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateUserControlWithNullPropertyValueTestsBase.cs index af8c4cf850..6d3efebb77 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateUserControlWithNullPropertyValueTestsBase.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/GenerateUserControlWithNullPropertyValueTestsBase.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingCodeBuilderTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingCodeBuilderTests.cs index 19755fa84e..3dd2547297 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingCodeBuilderTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingCodeBuilderTests.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Scripting; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerGeneratorTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerGeneratorTests.cs index a142a5d44b..95f3ea81df 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerGeneratorTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerGeneratorTests.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerLoaderTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerLoaderTests.cs index d7e1cc5736..d03e5270c8 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerLoaderTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Designer/ScriptingDesignerLoaderTests.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/CustomClassTypeConverter.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/CustomClassTypeConverter.cs index 5fd330240d..b6a378bf2b 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/CustomClassTypeConverter.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/CustomClassTypeConverter.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCodeDomSerializer.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCodeDomSerializer.cs index 81185484d0..a5e3011ba6 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCodeDomSerializer.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeCodeDomSerializer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel.Design; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeComponentWalker.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeComponentWalker.cs index 0c36d16507..f9ed3b2a4b 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeComponentWalker.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeComponentWalker.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDesignerSerializationManager.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDesignerSerializationManager.cs index b10000e14e..e41f0abaa3 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDesignerSerializationManager.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/FakeDesignerSerializationManager.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MSBuildEngineHelper.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MSBuildEngineHelper.cs index 0cbcf4d12b..9d0d77a3f9 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MSBuildEngineHelper.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MSBuildEngineHelper.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.IO; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerGenerator.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerGenerator.cs index 64dc901359..0e42711189 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerGenerator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.SharpDevelop.Dom; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerLoader.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerLoader.cs index f1d059d3e7..09880c0c6d 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerLoader.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableScriptingDesignerLoader.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel.Design.Serialization; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableThreadSafeScriptingConsoleEvents.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableThreadSafeScriptingConsoleEvents.cs index d84f40fc47..185efc00f7 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableThreadSafeScriptingConsoleEvents.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/TestableThreadSafeScriptingConsoleEvents.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/TestableScriptingDesignerGeneratorTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/TestableScriptingDesignerGeneratorTests.cs index c69ff27ba4..7ef2833ec1 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/TestableScriptingDesignerGeneratorTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/Tests/TestableScriptingDesignerGeneratorTests.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.SharpDevelop.Dom; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs index 61493fc875..614dc35f4b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 22.01.2009 - * Zeit: 16:07 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Core; using ICSharpCode.Reports.Core; @@ -88,4 +83,3 @@ namespace ICSharpCode.Reports.Addin.Commands } } } - 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 8e91e4b135..b0c9ee511d 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 @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 14.10.2007 - * Zeit: 18:40 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs index 7c91f185f3..1c7cdb8a3d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/PreviewCommands.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 05.04.2008 - * Zeit: 10:37 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Globalization; 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 bafe18558d..b8ed4cb3a0 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 @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 17:12 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Globalization; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Configuration/AssemblyInfo.cs index d69378a7da..13644ccfa1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Configuration/AssemblyInfo.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System.Reflection; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DataItemDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DataItemDesigner.cs index a25225a2a0..a32b08bd6d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DataItemDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DataItemDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 30.01.2008 - * Zeit: 08:24 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs index 5b081f959c..1c16284e1e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 04.12.2007 - * Zeit: 08:56 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DragObject.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DragObject.cs index 933ed2bedd..c8988a9d03 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DragObject.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DragObject.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.11.2007 - * Zeit: 23:03 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupeHeaderDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupeHeaderDesigner.cs index 176f18d5f3..bc9c2ab7f2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupeHeaderDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupeHeaderDesigner.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 08.08.2010 - * Time: 18:33 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs index f6bd1f4e64..fe822af604 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupedRowDesigner.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 15.08.2010 - * Time: 19:40 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs index a58ee7a17f..12c2033095 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ImageDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 01.02.2008 - * Zeit: 13:07 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -92,5 +86,4 @@ namespace ICSharpCode.Reports.Addin.Designer base.Dispose(disposing); } } -} - +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/LineDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/LineDesigner.cs index f4b76297b8..a98e896625 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/LineDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/LineDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 04.12.2007 - * Zeit: 10:05 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportItemsContainer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportItemsContainer.cs index 6cf1c73cc7..cc9cea95e7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportItemsContainer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportItemsContainer.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.11.2007 - * Zeit: 22:08 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs index c20370adeb..398483a78c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RootDesigner/ReportRootDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.11.2007 - * Zeit: 22:54 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RowItemDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RowItemDesigner.cs index 4a41f90dba..ec3262d38c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RowItemDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/RowItemDesigner.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 28.01.2008 - * Zeit: 18:32 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Ruler.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Ruler.cs index 49300a55cc..1c0c17f00c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Ruler.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/Ruler.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -366,4 +362,3 @@ namespace ICSharpCode.Reports.Addin.Designer #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SectionDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SectionDesigner.cs index 97369cfb9a..fd41a66cc2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SectionDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SectionDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 12.11.2007 - * Zeit: 09:24 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ShapeDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ShapeDesigner.cs index 1024a6c4c7..009ef5e4c6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ShapeDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/ShapeDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 01.02.2008 - * Zeit: 12:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -92,4 +86,4 @@ namespace ICSharpCode.Reports.Addin.Designer base.Dispose(disposing); } } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SmartTagTransactions.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SmartTagTransactions.cs index 61e891d74b..dc91e142db 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SmartTagTransactions.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/SmartTagTransactions.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.11.2008 - * Zeit: 22:10 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TableDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TableDesigner.cs index f0b4d4f501..76167df35d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TableDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TableDesigner.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 23.09.2008 - * Zeit: 20:03 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using System.ComponentModel; @@ -121,4 +116,4 @@ namespace ICSharpCode.Reports.Addin.Designer } #endregion } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs index d5d6272221..a226cf05d5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.11.2008 - * Zeit: 22:05 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs index 369b77afad..3ac3f6f11e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.11.2007 - * Zeit: 22:49 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/IDesignerGenerator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/IDesignerGenerator.cs index 1822302dba..1214c378a8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/IDesignerGenerator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/IDesignerGenerator.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 23.04.2009 - * Zeit: 20:04 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.CodeDom; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs index 4101240bc8..2365538f22 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 26.04.2009 - * Zeit: 18:47 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs index 4d723a26ae..c5ad57b05c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs @@ -1,3 +1,6 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; 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 190e468f33..72ec819184 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 @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 16:50 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.SharpDevelop; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs index 67d840df64..0c6fd3f869 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 26.11.2007 - * Zeit: 18:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs index 9e229b8880..1063e54a42 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs @@ -1,3 +1,6 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.Collections.Generic; @@ -141,4 +144,3 @@ namespace ICSharpCode.Reports.Addin } } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.Designer.cs index 4a26404433..ddcf1ea18c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.Designer.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 08.02.2009 - * Zeit: 18:12 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + namespace ICSharpCode.Reports.Addin { partial class ExpressionEditor diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.cs index f2a749f9f6..c0b7cfa0bb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Dialogs/ExpressionEditor.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 08.02.2009 - * Zeit: 18:12 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/FormsDesignerLoadException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/FormsDesignerLoadException.cs index 62209e6513..38d975e362 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/FormsDesignerLoadException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/FormsDesignerLoadException.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 21.06.2009 - * Zeit: 19:29 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/GlobalsDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/GlobalsDesigner.cs index e05b3f71c2..a6e985e45d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/GlobalsDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/GlobalsDesigner.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 18.01.2009 - * Zeit: 11:41 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/StringWriterWithEncoding.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/StringWriterWithEncoding.cs index a535114df3..18f69d43b6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/StringWriterWithEncoding.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Globals/StringWriterWithEncoding.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 21.06.2009 - * Zeit: 18:26 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Text; namespace ICSharpCode.Reports.Addin diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs index 3fb6ec3ab3..aee3f5b73a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 16:54 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerNodes.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerNodes.cs index 055c69a241..f9167ad8cf 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerNodes.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerNodes.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 16.08.2008 - * Zeit: 14:28 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs index 85ecb332ea..2c49e1d109 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; 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 5b3d7b557d..d974521a8e 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 @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/AbstractItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/AbstractItem.cs index a054e6fa18..4ea1bc6edd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/AbstractItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/AbstractItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.11.2007 - * Zeit: 22:34 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs index 416cf6e785..bd242a9d12 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseCircleItem.cs @@ -1,12 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 31.01.2008 - * Zeit: 17:06 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseDataItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseDataItem.cs index c8e3a32125..863ece1c8b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseDataItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseDataItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 28.01.2008 - * Zeit: 16:47 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs index 4127f2f694..c6adf8b64b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 07.08.2010 - * Time: 21:57 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupedRow.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupedRow.cs index 748454f64a..6637441651 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupedRow.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupedRow.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 15.08.2010 - * Time: 19:38 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs index 31a5a61dcc..b0dcc1c7aa 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 01.02.2008 - * Zeit: 08:24 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs index 34e893d1f9..b951f824fa 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseLine.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 04.12.2007 - * Zeit: 09:00 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRectangleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRectangleItem.cs index e54623f117..972030fd7f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRectangleItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRectangleItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 31.01.2008 - * Zeit: 15:58 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs index e9312db45d..ce5d40d9e5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseRowItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 28.01.2008 - * Zeit: 16:41 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseSection.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseSection.cs index 917980aa76..0b23c1708c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseSection.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseSection.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 12.11.2007 - * Zeit: 09:23 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs index 95af98ca5e..3019a8f3f5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTableItem.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 23.09.2008 - * Zeit: 19:38 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs index 75ea6996e5..754391693f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.11.2007 - * Zeit: 22:46 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/ErrorItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/ErrorItem.cs index 3e14fa7d06..4603aa3572 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/ErrorItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/ErrorItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.05.2008 - * Zeit: 12:57 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/RectangleItemTypeProvider.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/RectangleItemTypeProvider.cs index 29ada7cef9..b1344f2e14 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/RectangleItemTypeProvider.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/RectangleItemTypeProvider.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 23.04.2009 - * Zeit: 19:38 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using ICSharpCode.Reports.Addin.Designer; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/BaseManager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/BaseManager.cs index 30dc97c58f..762c6f7597 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/BaseManager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/BaseManager.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 31.01.2008 - * Zeit: 12:58 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/StandartPreviewManager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/StandartPreviewManager.cs index 908a12358b..7795ef6b95 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/StandartPreviewManager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportManagers/StandartPreviewManager.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 02.12.2007 - * Zeit: 23:17 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Data; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs index e14749b212..7522b1d063 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -216,6 +212,3 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } } } - - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs index 0a058c4a94..563d68a3aa 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.IO; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs index 1f6c0310d6..f4ccc0cea4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 23.05.2008 - * Zeit: 22:16 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs index 00e1979da8..f7e371f837 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 29.08.2008 - * Zeit: 18:16 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Core; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs index 131c03ad0b..7978343de2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Core; @@ -53,4 +49,3 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs index 2146038e50..60d89c8cb3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.10.2008 - * Zeit: 19:09 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Core; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/WizardHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/WizardHelper.cs index 834414074d..d113a15f70 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/WizardHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/WizardHelper.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 30.05.2008 - * Zeit: 16:19 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; @@ -89,4 +83,4 @@ namespace ICSharpCode.Reports.Addin.ReportWizard return textItem; } } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs index 6969d34dd6..f13c8ebe71 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 30.05.2008 - * Zeit: 16:33 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs index df928da8f3..5c6e2441ee 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs @@ -1,9 +1,6 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/TableLayout.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/TableLayout.cs index 585a5abd0b..e0c5a570b9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/TableLayout.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/TableLayout.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 04.10.2008 - * Zeit: 19:29 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs index 1503decb64..d56458363a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs index e10b413772..42c8dfe5bb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 17.05.2008 - * Zeit: 17:22 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.IO; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardCommands.cs index af26452956..bb35e7d6f9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardCommands.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 05.01.2009 - * Zeit: 19:27 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs index 2960e9c500..470b80ba65 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/DataGridViewColumnHeaderCheckBoxCell.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/DataGridViewColumnHeaderCheckBoxCell.cs index 900b58e3f9..477bea88bb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/DataGridViewColumnHeaderCheckBoxCell.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/DataGridViewColumnHeaderCheckBoxCell.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 01.09.2007 - * Zeit: 15:10 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; @@ -263,4 +257,4 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } #endregion -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs index edaf77453d..c3221f723c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 03.10.2008 - * Zeit: 17:41 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs index 1a67e960c2..9ce4704a03 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.Designer.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 03.10.2008 - * Zeit: 17:52 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + namespace ICSharpCode.Reports.Addin.ReportWizard { partial class LayoutPanelControl diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs index 952345e6fb..39da9c8733 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 03.10.2008 - * Zeit: 17:52 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs index f6cbbdb2a6..5f0ef18ec1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; @@ -387,4 +383,3 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PushModelPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PushModelPanel.cs index 08c8d9b878..390c966bed 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PushModelPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PushModelPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs index 2655d1554a..09c076c233 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; @@ -422,5 +418,3 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractOptionPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractOptionPanel.cs index 50d38a13ce..6166be82b0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractOptionPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractOptionPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractWizardPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractWizardPanel.cs index 2ca650d9c3..bd3d603583 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractWizardPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/AbstractWizardPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/CurrentPanelPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/CurrentPanelPanel.cs index 567c2966f8..1267846da5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/CurrentPanelPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/CurrentPanelPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DefaultDialogPanelDescriptor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DefaultDialogPanelDescriptor.cs index 12626bde84..9080714d05 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DefaultDialogPanelDescriptor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DefaultDialogPanelDescriptor.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DialogPanelDoozer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DialogPanelDoozer.cs index 4210ce1a4c..f3b92dce4e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DialogPanelDoozer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/DialogPanelDoozer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanel.cs index 61d2ad63d8..035a040b63 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanelDescriptor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanelDescriptor.cs index b36edb527d..13f67998fa 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanelDescriptor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IDialogPanelDescriptor.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IWizardPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IWizardPanel.cs index 1ec6dd8314..75483eafc5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IWizardPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/IWizardPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/StatusPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/StatusPanel.cs index f13134d4e6..3995174e37 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/StatusPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/StatusPanel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/WizardDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/WizardDialog.cs index 7cb87bae13..f1a7c38fc1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/WizardDialog.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/Wizard/WizardDialog.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportPreview.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportPreview.cs index 847cdf9968..ef0fb64a0c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportPreview.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportPreview.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 02.12.2007 - * Zeit: 23:17 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Windows.Forms; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs index e87884ff90..3c9e56aadc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 07.04.2010 - * Zeit: 20:09 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Core; using ICSharpCode.Reports.Core.ReportViewer; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs index ed5552eb93..9af6ac3c14 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 02.04.2008 - * Zeit: 08:37 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/XmlView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/XmlView.cs index 8bc99bf9e0..97a662b829 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/XmlView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/XmlView.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 17:35 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Windows.Forms; using ICSharpCode.SharpDevelop.Gui; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultMemberRelationshipService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultMemberRelationshipService.cs index 65ba6e706f..93307e6972 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultMemberRelationshipService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultMemberRelationshipService.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 21.10.2007 - * Zeit: 16:07 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel.Design.Serialization; @@ -29,4 +24,4 @@ namespace ICSharpCode.Reports.Addin return base.GetRelationship(source); } } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultServiceContainer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultServiceContainer.cs index 6482a7d50e..7cf7c30053 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultServiceContainer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DefaultServiceContainer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; @@ -124,4 +120,3 @@ namespace ICSharpCode.Reports.Addin } } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DesignerSerializationService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DesignerSerializationService.cs index 01576cf2ba..bbd23dde44 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DesignerSerializationService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/DesignerSerializationService.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 15.10.2007 - * Zeit: 11:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/HelpService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/HelpService.cs index b331acb4f3..453649d130 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/HelpService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/HelpService.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) // created on 10/10/2002 at 16:13 diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/MenuCommandService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/MenuCommandService.cs index fceb991b4e..d2d9ed1d33 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/MenuCommandService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/MenuCommandService.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 14.10.2007 - * Zeit: 15:39 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel.Design; using System.Drawing; @@ -75,4 +70,3 @@ namespace ICSharpCode.Reports.Addin } } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/NameCreationService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/NameCreationService.cs index 0e429ef050..5822416029 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/NameCreationService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/NameCreationService.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 17:20 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/ToolboxService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/ToolboxService.cs index 087054d07c..52f1c526eb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/ToolboxService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/ToolboxService.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 17:19 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeDiscoveryService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeDiscoveryService.cs index 8e38365956..1f1d912c62 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeDiscoveryService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeDiscoveryService.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeResolutionService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeResolutionService.cs index fe9f7aeef2..b2b5a898bb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeResolutionService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/TypeResolutionService.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/UIService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/UIService.cs index cc75674515..cf29ee426e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/UIService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Services/UIService.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/SideTabItemDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/SideTabItemDesigner.cs index 4e7da95b76..c61d441146 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/SideTabItemDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/SideTabItemDesigner.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) /* * Module : FormDesigner diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs index 6132c14ded..dd2bbe243c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2007 - * Zeit: 17:22 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using ICSharpCode.Core.WinForms; using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/UndoRedo/UndoEngine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/UndoRedo/UndoEngine.cs index a2516631f4..1e25020eb4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/UndoRedo/UndoEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/UndoRedo/UndoEngine.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/MycroWriter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/MycroWriter.cs index aaa290ac1d..38f0afe5ff 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/MycroWriter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/MycroWriter.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 30.01.2008 - * Zeit: 11:47 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs index 1a53c94fc7..9fecae79d3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: PeterForstmeier - * Date: 3/31/2007 - * Time: 1:57 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Forms; @@ -243,4 +237,3 @@ namespace ICSharpCode.Reports.Addin } } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDesignerWriter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDesignerWriter.cs index 8e9c570eb4..31e281d48e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDesignerWriter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDesignerWriter.cs @@ -1,12 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 29.11.2007 - * Zeit: 22:13 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/XmlHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/XmlHelper.cs index 2baa2173c1..c37b0bc44f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/XmlHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/XmlHelper.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 20.05.2008 - * Zeit: 18:24 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Xml; @@ -40,4 +34,4 @@ namespace ICSharpCode.Reports.Addin writer.WriteStartElement("ReportSettings"); } } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/AssemblyInfo.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/AssemblyInfo.cs index 7cd07b36c4..8ca83eef71 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/AssemblyInfo.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/AssemblyInfo.cs @@ -1,3 +1,6 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/DerivedReportDesignerDisplayBinding.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/DerivedReportDesignerDisplayBinding.cs index fe33be9775..3ed9cc40a7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/DerivedReportDesignerDisplayBinding.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/DerivedReportDesignerDisplayBinding.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.05.2009 - * Zeit: 17:50 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Addin.Test.Designer diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockDesignerGenerator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockDesignerGenerator.cs index 6f432cf10b..6dc8b88eab 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockDesignerGenerator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockDesignerGenerator.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.05.2009 - * Zeit: 17:30 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Addin; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockOpenedFile.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockOpenedFile.cs index c1564530e6..b4b99c5813 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockOpenedFile.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockOpenedFile.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockReportDesignerDisplayBinding.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockReportDesignerDisplayBinding.cs index a42da7d873..d3122d361c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockReportDesignerDisplayBinding.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockReportDesignerDisplayBinding.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 30.04.2009 - * Zeit: 20:16 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs index 1d0edb2852..cc2ada08b4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.05.2009 - * Zeit: 17:53 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs index 92ef5d31a6..7964838892 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 30.04.2009 - * Zeit: 20:14 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; @@ -70,4 +64,4 @@ namespace ICSharpCode.Reports.Addin.Test.Designer } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerLoaderTestFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerLoaderTestFixture.cs index 1266e908e5..d386da77be 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerLoaderTestFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerLoaderTestFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.05.2009 - * Zeit: 17:46 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs index 5859e925a0..8b78656c7a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 30.10.2008 - * Zeit: 19:54 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Windows.Forms; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs index ff5af9fe88..dbe3a54d98 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 30.10.2008 - * Zeit: 20:00 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/MeasurementServiceFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/MeasurementServiceFixture.cs index b8638484ba..6e3aa17c6a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/MeasurementServiceFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/MeasurementServiceFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 07.09.2008 - * Zeit: 18:32 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs index 2ab6dfcc6e..ff4c52bdcb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 03.11.2008 - * Zeit: 19:34 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Linq; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs index 4738ad5dd1..dd82242b4f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.04.2009 - * Zeit: 19:32 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs index 950444b4f8..f1efa6f2f6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 28.12.2008 - * Zeit: 19:22 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs index d9b8a322f2..a4d6bf8c98 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 31.08.2010 - * Time: 19:51 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using ICSharpCode.Reports.Addin.ReportWizard; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs index 14da1e6303..3c90302a2f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 28.12.2008 - * Zeit: 18:25 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs index f2cf1444cf..05c35983f8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 05.04.2009 - * Zeit: 17:56 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratorFactoryFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratorFactoryFixture.cs index 72df85a999..5fc3aaaf17 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratorFactoryFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratorFactoryFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.10.2008 - * Zeit: 19:36 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Addin.ReportWizard; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs index 892574f045..da3054b10d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 03.11.2008 - * Zeit: 19:36 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Reports.Core; using ICSharpCode.Reports.Addin.ReportWizard; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs index 4421c58bcd..765caf2bfb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 02.11.2008 - * Zeit: 18:16 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/AbstractColumn.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/AbstractColumn.cs index 47beb10ca1..2f2b9ff3de 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/AbstractColumn.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/AbstractColumn.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Xml; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/BasicParameter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/BasicParameter.cs index cc6531de4f..807858ca77 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/BasicParameter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/BasicParameter.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) namespace ICSharpCode.Reports.Core { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs index 1f00fc491e..066fa36e2d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 22.09.2009 - * Zeit: 20:12 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/GroupColumn.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/GroupColumn.cs index 2596b4606f..15d11f47e4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/GroupColumn.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/GroupColumn.cs @@ -1,9 +1,6 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs index 523fa7b66b..85e01eb9e0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 12.11.2009 - * Zeit: 19:40 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/MeasurementService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/MeasurementService.cs index 5cf0291a07..569bb3ba76 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/MeasurementService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/MeasurementService.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs index f3bb3690be..83afb007b4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 02.03.2009 - * Zeit: 19:20 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs index bfb47995cc..0a3411dfc0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Globalization; @@ -161,4 +157,3 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs index 93561753af..9a18b4a781 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 20.06.2010 - * Time: 19:04 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core.Exporter; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs index 36e689d4d1..4dd407fd49 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs index eb28498f64..7a05b312e2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs index 0234b0cd4e..3ef4b82820 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 02.02.2009 - * Zeit: 13:27 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using ICSharpCode.Reports.Core.Interfaces; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SortColumn.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SortColumn.cs index dd0bfe789b..80bd3d4814 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SortColumn.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SortColumn.cs @@ -1,22 +1,11 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 29.08.2009 - * Zeit: 16:27 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; - - +namespace ICSharpCode.Reports.Core +{ /// /// This Class represents a Column to sort /// @@ -24,9 +13,6 @@ using System.ComponentModel; /// created by - Forstmeier Peter /// created on - 18.05.2005 11:34:45 /// - /// -namespace ICSharpCode.Reports.Core -{ public class SortColumn : AbstractColumn { private ListSortDirection sortDirection = ListSortDirection.Ascending; @@ -72,4 +58,3 @@ namespace ICSharpCode.Reports.Core #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SqlParameter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SqlParameter.cs index 1b9f73c470..d75552f965 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SqlParameter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SqlParameter.cs @@ -1,9 +1,6 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs index 1dabe3f9b3..cd080b21f4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs index 3559657016..a1ccf21924 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupItem.cs index 12ae1bf839..7908165cdd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupItem.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 07.08.2010 - * Time: 22:10 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs index 0ebdab4e74..134ef94a11 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 24.08.2010 - * Time: 20:14 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs index bf0df7481e..224ff65f18 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -161,4 +157,3 @@ namespace ICSharpCode.Reports.Core { } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs index 223634c6a6..63c3e0ed6e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -126,5 +122,3 @@ namespace ICSharpCode.Reports.Core{ #endregion } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs index 4b73d55721..ee3cbeeda9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -173,4 +169,3 @@ namespace ICSharpCode.Reports.Core #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs index 9da696f0bf..c807f1f27d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using ICSharpCode.Reports.Expressions.ReportingLanguage; using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs index 8a432b0914..8b0dc34e53 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -205,4 +201,3 @@ namespace ICSharpCode.Reports.Core } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs index a0d374b906..f1d93398d2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 13.05.2008 - * Zeit: 18:44 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs index 8a4b6beb68..2bbfc0e8a6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs index 30a5cc423b..a79f42b2c4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) /// /// Handles the drawing of Images like Bitmap's and so on diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs index 530a14a511..58cbd56fe0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs index 66b4922e0b..5758d84892 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs index 3fd0959dd6..0514ff8c52 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision: 6130 $ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IExpression.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IExpression.cs index 05cf56982c..2241d4cd1f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IExpression.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IExpression.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 25.07.2010 - * Time: 14:30 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs index f3f9aaeaf9..46b2899e91 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Configuration/AssemblyInfo.cs index db9c7ce005..4fab6a9c42 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Configuration/AssemblyInfo.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System.Reflection; using System.Runtime.CompilerServices; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ConnectionObject.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ConnectionObject.cs index d15123ac04..288542681e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ConnectionObject.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ConnectionObject.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs index 5749acc8cb..f9d830b600 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 27.07.2010 - * Time: 16:02 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Linq; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs index dfef2ad154..6aa1904dc9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/BaseComparer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.ObjectModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/GroupSeparator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/GroupSeparator.cs index c3a7b3726d..5c54d037e2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/GroupSeparator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/GroupSeparator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.ObjectModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs index 353e3b62b3..5e3e923ccd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.ObjectModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs index eb8366ee00..768dadb030 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs index 5b0df5742e..fc0e275d2d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedPropertyDescriptor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedPropertyDescriptor.cs index 7832fc2720..d132d970ea 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedPropertyDescriptor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedPropertyDescriptor.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedTypeDescriptor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedTypeDescriptor.cs index 361b81c917..f89b38a3ec 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedTypeDescriptor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/ExtendedTypeDescriptor.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/IndexList.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/IndexList.cs index 2c59416838..3543a2088e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/IndexList.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/IndexList.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/PropertyTypeHash.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/PropertyTypeHash.cs index 54e807020f..9147e4063c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/PropertyTypeHash.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListHandling/PropertyTypeHash.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs index b6449945ba..d52a4dd9cb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs index 05b93ca974..0407972cb4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; @@ -59,7 +55,7 @@ namespace ICSharpCode.Reports.Core { if (descriptor == null){ throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, - "Die Liste enthält keine Spalte [{0}].", + "Die Liste enthält keine Spalte [{0}].", col[criteriaIndex].ColumnName)); } sortProperties[criteriaIndex] = descriptor; @@ -76,10 +72,10 @@ namespace ICSharpCode.Reports.Core { object rowItem = this.baseList[rowIndex]; object[] values = new object[col.Count]; - // Hier bereits Wertabruf um dies nicht während des Sortierens tun zu müssen. + // Hier bereits Wertabruf um dies nicht während des Sortierens tun zu müssen. for (int criteriaIndex = 0; criteriaIndex < sortProperties.Length; criteriaIndex++){ object value = sortProperties[criteriaIndex].GetValue(rowItem); - // Hier auf Verträglichkeit testen um Vergleiche bei Sortierung zu vereinfachen. + // Hier auf Verträglichkeit testen um Vergleiche bei Sortierung zu vereinfachen. // Muss IComparable und gleicher Typ sein. if (value != null && value != DBNull.Value) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs index fa9e30416a..176055672c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 29.08.2009 - * Zeit: 09:57 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs index cb0dce1b02..750882841d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlDataAccess.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 10.12.2008 - * Zeit: 19:53 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Data; using System.Globalization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlQueryChecker.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlQueryChecker.cs index 1c112114bd..d2ca1318b4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlQueryChecker.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/SqlQueryChecker.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs index ae8c7b5426..10daf56f26 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 20.05.2007 - * Zeit: 18:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.Designer.cs index 283ddd6578..541aabba3d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.Designer.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 09.04.2007 - * Zeit: 17:01 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + namespace ICSharpCode.Reports.Core { partial class TextEditorDialog diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs index 21d9e5e073..15ebae5d88 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 09.04.2007 - * Zeit: 17:01 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs index cfb59a567b..5e12457619 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/GroupingCollectionEditor.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 22.08.2010 - * Time: 13:37 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParameterDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParameterDialog.cs index aa9e5530b4..08f810166a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParameterDialog.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParameterDialog.cs @@ -1,12 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.02.2008 - * Zeit: 16:57 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; @@ -144,4 +137,3 @@ namespace ICSharpCode.Reports.Core #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs index 2a93e8ab99..a5768e2f73 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/ParametersCollectionEditor.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 10.02.2009 - * Zeit: 14:31 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/PreviewControl.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/PreviewControl.cs index e655429eeb..b9ebbba7e3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/PreviewControl.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/PreviewControl.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs index 12ab2f7e85..40762d414b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/SortingCollectionEditor.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 22.08.2010 - * Time: 13:25 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.ComponentModel; using System.ComponentModel.Design; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/EventHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/EventHelper.cs index ec55ba98ac..a02d30564d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/EventHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/EventHelper.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/GroupChangedEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/GroupChangedEventArgs.cs index dbdf655cea..fc0fffd384 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/GroupChangedEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/GroupChangedEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/NewPageEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/NewPageEventArgs.cs index 0463c23e79..2b9fc5faef 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/NewPageEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/NewPageEventArgs.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 14.08.2009 - * Zeit: 20:04 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core.Events diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/PrintEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/PrintEventArgs.cs index 5dbfe5a4f3..bca24510e7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/PrintEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/PrintEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs index 48f79065f1..d9d85a3468 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportParametersEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportParametersEventArgs.cs index 377b23225a..950ec79748 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportParametersEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportParametersEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) namespace ICSharpCode.Reports.Core { using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/SectionRenderEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/SectionRenderEventArgs.cs index a4d7b44d0d..68ccc0f2ef 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/SectionRenderEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/SectionRenderEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/FieldNotFoundException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/FieldNotFoundException.cs index c23ec0098f..4c9b271572 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/FieldNotFoundException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/FieldNotFoundException.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.02.2009 - * Zeit: 13:25 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Runtime.Serialization; using System.Security.Permissions; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/GroupLevelException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/GroupLevelException.cs index f3c25257cf..059c5cafdb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/GroupLevelException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/GroupLevelException.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 15.11.2008 - * Zeit: 19:45 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalFileFormat.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalFileFormat.cs index 641675b5ca..f1118a960c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalFileFormat.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalFileFormat.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalQueryException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalQueryException.cs index 5bab926fae..2e1e554f9e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalQueryException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/IllegalQueryException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/InvalidReportModelException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/InvalidReportModelException.cs index c21100a558..6d62edf4d1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/InvalidReportModelException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/InvalidReportModelException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataManagerException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataManagerException.cs index 16b073ec14..648565d3e2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataManagerException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataManagerException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataSourceException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataSourceException.cs index 59f9d5b412..41b868b228 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataSourceException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingDataSourceException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingModelException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingModelException.cs index f261f56540..48c2d07152 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingModelException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingModelException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingParentException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingParentException.cs index 428ed9f596..3ace0b3b5b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingParentException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingParentException.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 09.11.2008 - * Zeit: 11:49 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingSectionException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingSectionException.cs index 10f0c85309..b25a192076 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingSectionException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/MissingSectionException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/ReportException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/ReportException.cs index b2deb6bc2f..49a086cfcc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/ReportException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/ReportException.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownFunctionException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownFunctionException.cs index 8b37e1dd8c..ec009e4c8e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownFunctionException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownFunctionException.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 08.02.2009 - * Zeit: 13:07 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Runtime.Serialization; using System.Security.Permissions; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownItemException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownItemException.cs index 0605a0b458..12ab193725 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownItemException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/UnknownItemException.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 23.01.2007 - * Zeit: 17:16 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongColumnException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongColumnException.cs index 0739111413..362849a85a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongColumnException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongColumnException.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 11.01.2007 - * Zeit: 22:42 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongSectionException.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongSectionException.cs index eccae2543b..5f1b8d1ab3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongSectionException.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exceptions/WrongSectionException.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 24.03.2010 - * Zeit: 19:31 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Runtime.Serialization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index e0523f51b5..7aa7f483ba 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 01.05.2007 - * Zeit: 15:38 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -308,4 +302,3 @@ namespace ICSharpCode.Reports.Core.Exporter #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index 73693b86c8..029e03d576 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 28.12.2008 - * Zeit: 17:30 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/ConverterFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/ConverterFactory.cs index a9e5aa628e..1cbe65190b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/ConverterFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/ConverterFactory.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 04.01.2009 - * Zeit: 16:40 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core.Interfaces; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs index 476857d3a3..dc3a955fe3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 02.01.2009 - * Zeit: 17:33 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs index 5cb8e3c9bc..258ebf6966 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 21.12.2008 - * Zeit: 11:22 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs index db76ed6658..0b20c333e1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs index f8b58c212a..a0f2dd8415 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/GraphicStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/GraphicStyleDecorator.cs index eca76ab597..39faadd7f4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/GraphicStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/GraphicStyleDecorator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs index fd2490e17c..8fccd2d04e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/ILineDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/ILineDecorator.cs index 9ed906ebf4..6fbf98fa88 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/ILineDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/ILineDecorator.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 27.09.2009 - * Zeit: 12:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -18,5 +12,3 @@ namespace ICSharpCode.Reports.Core.Exporter Point To { get; set; } } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/Linedecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/Linedecorator.cs index bd426be199..5ac094d4f8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/Linedecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/Linedecorator.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 27.09.2009 - * Zeit: 12:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -23,5 +17,3 @@ namespace ICSharpCode.Reports.Core.Exporter public Point To { get; set; } } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/TextStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/TextStyleDecorator.cs index 90fc5749a3..201a0b76e2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/TextStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Decorators/TextStyleDecorator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs index a1099c0cff..966ee5ee23 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportContainer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportContainer.cs index b5d37b9ea8..289a0f6274 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportContainer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportContainer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs index a6876c7feb..3839f6b52b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs index fb2ccdbd0d..98256dfdc0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs index 9ed1cd6e39..3d23af56ca 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportColumnBuilder .cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportColumnBuilder .cs index b2e5059a3c..f7ef5c60d4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportColumnBuilder .cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportColumnBuilder .cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportContainer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportContainer.cs index 89a01c1e87..a47fdf942f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportContainer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportContainer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision: 5369 $ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using iTextSharp.text.pdf; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs index ff5b59256a..963f3de630 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/BaseExportRenderer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/HTMLRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/HTMLRenderer.cs index c739d8a306..f013a2c564 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/HTMLRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/HTMLRenderer.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 15.05.2007 - * Zeit: 22:08 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs index 81814fc1d0..4acec16352 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 18.07.2007 - * Zeit: 09:40 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs index f15d47246b..ec4b775058 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PreviewRenderer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs index 1806bfa24a..ccf877fafe 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PrintRenderer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/XPSRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/XPSRenderer.cs index 6c6591505b..c21e16c9af 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/XPSRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/XPSRenderer.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 15.05.2007 - * Zeit: 22:17 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs index c65f44705b..8a2a24909f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs index d1ce3740af..4bfde611d1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 04.05.2007 - * Zeit: 11:34 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using ICSharpCode.Reports.Core.Interfaces; using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageEventArgs.cs index b4b33d98b7..807632e6ee 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs index 67b3f0d467..7a8729d780 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 28.06.2009 - * Zeit: 18:54 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Reports.Core.Interfaces; using SimpleExpressionEvaluator; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs index d9280d722a..457917578a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 28.06.2009 - * Zeit: 19:53 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using ICSharpCode.Reports.Core.Interfaces; using System; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguage.cs index a7a10d44a6..e410c88533 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguage.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 14.06.2009 - * Zeit: 18:47 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using Irony.CompilerServices; using Irony.Scripting.Ast; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs index d6144e603d..90a75ac69c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 14.06.2009 - * Zeit: 18:27 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using ICSharpCode.Reports.Core.Interfaces; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionEvaluator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionEvaluator.cs index d8da2b8763..ca0679c7f1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionEvaluator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionEvaluator.cs @@ -1,4 +1,7 @@ -using SimpleExpressionEvaluator; +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using SimpleExpressionEvaluator; namespace ICSharpCode.Reports.Expressions.ReportingLanguage { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionLanguageCompiler.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionLanguageCompiler.cs index fabc40b938..22292c416f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionLanguageCompiler.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/SimpleExpressionLanguageCompiler.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; using System.Collections.Generic; using System.Reflection; using SimpleExpressionEvaluator; @@ -174,4 +177,4 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage } } } -} \ No newline at end of file +} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/ConnectionObjectFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/ConnectionObjectFactory.cs index f055254f32..c46105b081 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/ConnectionObjectFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/ConnectionObjectFactory.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data.Common; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DataManagerFacrory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DataManagerFacrory.cs index 585de87861..c0f61bc44f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DataManagerFacrory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DataManagerFacrory.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 09.11.2009 - * Zeit: 19:48 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DisplayNameAttribute.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DisplayNameAttribute.cs index 6b968196f9..7eeef06fcd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DisplayNameAttribute.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/DisplayNameAttribute.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/RendererFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/RendererFactory.cs index 9d30f53665..0f9f4cd974 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/RendererFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/RendererFactory.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core.BaseClasses.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/SectionFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/SectionFactory.cs index 6542cdd94e..32c92e54c5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/SectionFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Factories/SectionFactory.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Reflection; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/CreateGraphicObject.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/CreateGraphicObject.cs index 3abc07ec87..2990f1ae3e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/CreateGraphicObject.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/CreateGraphicObject.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 21.12.2008 - * Zeit: 12:10 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using System.Drawing.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FilePathConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FilePathConverter.cs index 83b692f18d..292d5b3bd2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FilePathConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FilePathConverter.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 25.03.2007 - * Zeit: 16:59 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.IO; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FileUtility.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FileUtility.cs index 68af0a2bb8..0032ba644c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FileUtility.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FileUtility.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections.Generic; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FontCache.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FontCache.cs index 1463a66758..723b02acdc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FontCache.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/FontCache.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 07.09.2008 - * Zeit: 19:22 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalEnums.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalEnums.cs index 7781029a49..81db43b422 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalEnums.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalEnums.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Globalization; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalLists.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalLists.cs index 3929a322b8..26db315105 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalLists.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalLists.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 18.01.2009 - * Zeit: 11:08 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs index 535a4f7a04..4a9ee9f364 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -337,7 +333,7 @@ namespace ICSharpCode.Reports.Core { string[] resources = thisExe.GetManifestResourceNames(); string list = String.Empty; foreach (string resource in resources) list += resource + NL; -// System.Windows.Forms.MessageBox.Show("Verfügbare Ressource-Namen:" + NL + list); +// System.Windows.Forms.MessageBox.Show("Verfügbare Ressource-Namen:" + NL + list); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs index c9af09c36c..b3c59922db 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 28.07.2007 - * Zeit: 11:02 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using iTextSharp.text; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/ReportSectionNames.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/ReportSectionNames.cs index 57bfad9f62..c19ddee1c8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/ReportSectionNames.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/ReportSectionNames.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 23.03.2010 - * Zeit: 20:08 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs index 3ad6e6cc4b..3c1a68621f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 28.08.2009 - * Zeit: 11:17 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core.Exporter; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs index 05ffe2ddfc..d138ad5911 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataAccessStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataAccessStrategy.cs index f0e7f3452b..7e5b15df33 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataAccessStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataAccessStrategy.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 09.11.2009 - * Zeit: 20:25 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs index bae84f52a3..5fbac758cb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs index 737e57154f..0edf345c83 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataViewStrategy.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs index faf39b9aaf..eae93ece42 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //ToDo with NET2.0 change this Interface to the one provided by NET2.0 using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs index 553513d6ca..c927928d53 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 14.08.2009 - * Zeit: 20:00 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using ICSharpCode.Reports.Core.Events; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ILayouter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ILayouter.cs index ba2a2e8c46..b10d5f6b8a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ILayouter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ILayouter.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 15.11.2009 - * Zeit: 20:04 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; @@ -19,4 +14,4 @@ namespace ICSharpCode.Reports.Core.Interfaces Rectangle Layout (Graphics graphics,BaseSection section); Rectangle Layout (Graphics graphics,ISimpleContainer container); } -} \ No newline at end of file +} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IMeasurementService.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IMeasurementService.cs index 80a447ec63..24d772f3b8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IMeasurementService.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IMeasurementService.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 15.04.2009 - * Zeit: 20:31 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportItem.cs index 42772be55c..26a0e961cf 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportItem.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportModel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportModel.cs index 7dcc57e01a..8017f3e869 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportModel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IReportModel.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 09.07.2009 - * Zeit: 19:57 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core.Interfaces diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs index dcf918342d..ae60d4f583 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 02.02.2009 - * Zeit: 13:27 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs index 56af2a7831..8547a5fd59 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -257,5 +253,3 @@ namespace ICSharpCode.Reports.Core #endregion } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs index 105e45ead9..eafaa684a1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -343,5 +338,3 @@ namespace ICSharpCode.Reports.Core #endregion } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs index 8fadb6b799..1e5f2fb385 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ExtendedPrintController.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 02.03.2009 - * Zeit: 20:07 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseLine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseLine.cs index 698b84d084..ebf7d9569b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseLine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseLine.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs index 1c13184c62..c1ea5cbb43 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs index 2ae53e20f8..728b6853a5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs index c541cf7b08..111c9e2883 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs @@ -1,9 +1,6 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Drawing; using System.Drawing.Drawing2D; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs index 3c939dfea6..060f71452b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs index 7293da6330..eb1768131c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs index 286a4e90ed..4418e16f62 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs index 02b5dcb031..4110d2b498 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; @@ -256,5 +252,3 @@ namespace ICSharpCode.Reports.Core { #endregion } } - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderFormSheetReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderFormSheetReport.cs index c48eae34de..e90f602e77 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderFormSheetReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderFormSheetReport.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing.Printing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ReportDocument.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ReportDocument.cs index 1d8f2da84f..e95f31fad6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ReportDocument.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/ReportDocument.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using ICSharpCode.Reports.Core.Interfaces; using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs index 30336cbd4b..2cf0999347 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; @@ -753,4 +749,3 @@ namespace ICSharpCode.Reports.Core { #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportModel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportModel.cs index 2fe8277cf0..f2b1c829f5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportModel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportModel.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportParameters.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportParameters.cs index 8bbe79111e..c38bcaccfd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportParameters.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportParameters.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs index 22714c7d36..6b64995387 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs @@ -1,10 +1,5 @@ -// -// -// -// -// $Revision$ -// - +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -330,4 +325,3 @@ namespace ICSharpCode.Reports.Core{ } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/IReportViewerMessages.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/IReportViewerMessages.cs index 7a9fb18127..d6599db1ad 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/IReportViewerMessages.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/IReportViewerMessages.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/NumericToolStripTextBox.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/NumericToolStripTextBox.cs index 077b28a610..c053a2275c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/NumericToolStripTextBox.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/NumericToolStripTextBox.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs index 510b690383..5351b4c496 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs index 1ba3d5c469..6cc5c3bc9a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Forstmeier Helmut - * Date: 16.10.2006 - * Time: 22:15 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + namespace ICSharpCode.Reports.Core.ReportViewer { partial class PreviewControl : System.Windows.Forms.UserControl diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index 5a81f3ffa1..9c7137dc08 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -1,9 +1,5 @@ -// -// -// -// -// $Revision$ -// +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs index 43a5d7dc3b..bd761c0c4b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: PeterForstmeier - * Date: 3/31/2007 - * Time: 2:31 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs index 2f1ad397c9..86b15db844 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: PeterForstmeier - * Date: 3/31/2007 - * Time: 1:57 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; @@ -363,4 +357,3 @@ namespace ICSharpCode.Reports.Core #endregion } } - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroWriter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroWriter.cs index 0bd61e699a..f3528e5b59 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroWriter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroWriter.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: PeterForstmeier - * Date: 3/31/2007 - * Time: 2:09 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/AbstractColumnFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/AbstractColumnFixture.cs index 0c9269871d..2e51495c0c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/AbstractColumnFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/AbstractColumnFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 11.09.2009 - * Zeit: 19:40 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/GroupColumnFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/GroupColumnFixture.cs index 92f3659c5b..f4e0f88fff 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/GroupColumnFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/GroupColumnFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 15.11.2008 - * Zeit: 19:38 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/Parameters.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/Parameters.cs index 325c7fa671..4e289fbb66 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/Parameters.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/Parameters.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 27.06.2009 - * Zeit: 19:49 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/SortColumnFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/SortColumnFixture.cs index a8f59e9ad9..27b6d33130 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/SortColumnFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseClasses/SortColumnFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 12.11.2008 - * Zeit: 20:04 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs index 5686526f52..5f814219fb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 18.01.2009 - * Zeit: 18:01 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core.Exporter; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs index fa93d1c169..b69783e7e6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 19.01.2009 - * Zeit: 11:06 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseReportItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseReportItemFixture.cs index f39da37846..c02f884b20 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseReportItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseReportItemFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.12.2008 - * Zeit: 18:39 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs index bab47f0af5..c75efe1945 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 19.01.2009 - * Zeit: 11:40 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core.Exporter; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseSectionFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseSectionFixture.cs index 7396902275..9ef345dcb7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseSectionFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseSectionFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 28.03.2010 - * Zeit: 17:31 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs index 11eee4dd5b..5976ec3d68 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.12.2008 - * Zeit: 18:28 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/AvailableFieldsCollection.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/AvailableFieldsCollection.cs index 6c0e4dfe73..ba9484c39f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/AvailableFieldsCollection.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/AvailableFieldsCollection.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 20.02.2009 - * Zeit: 20:09 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Linq; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ColumnCollectionFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ColumnCollectionFixture.cs index 7f97e37149..ab1266e9ac 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ColumnCollectionFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ColumnCollectionFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 21.11.2008 - * Zeit: 19:30 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ParametersCollectionFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ParametersCollectionFixture.cs index 794a12e172..9a6529a352 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ParametersCollectionFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ParametersCollectionFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.02.2009 - * Zeit: 19:01 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ReportItemCollectionFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ReportItemCollectionFixture.cs index 296411d1f2..d3ba1b1ba0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ReportItemCollectionFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Collections/ReportItemCollectionFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 16.11.2008 - * Zeit: 18:33 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Linq; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupListFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupListFixture.cs index d3d66e58ff..6a2f91c0c4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupListFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupListFixture.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 09.09.2010 - * Time: 19:50 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs index ee87a31190..d0d7eccd38 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 01.07.2010 - * Time: 20:21 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IConnectionDataManagerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IConnectionDataManagerFixture.cs index f48c6d9f12..f785674c54 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IConnectionDataManagerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IConnectionDataManagerFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 27.11.2008 - * Zeit: 19:32 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs index de2858a248..3552a67579 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 27.11.2008 - * Zeit: 19:30 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/MockDataAccess.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/MockDataAccess.cs index 9a3379664a..ec042288bc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/MockDataAccess.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/MockDataAccess.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 10.12.2008 - * Zeit: 20:06 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Data; using System.Data.Common; @@ -52,4 +47,4 @@ namespace ICSharpCode.Reports.Core.Test.DataManager } } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs index 8f64ec6080..0fedbdce30 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 03.07.2010 - * Time: 18:03 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.ComponentModel; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs index e6b446a0de..04668e7933 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 27.11.2008 - * Zeit: 19:31 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Collections; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs index 4028917cf1..ab049bb28e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.09.2009 - * Zeit: 20:15 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/BaseLineFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/BaseLineFixture.cs index 84df24a108..3ad2d137e0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/BaseLineFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/BaseLineFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 04.10.2009 - * Zeit: 11:46 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/EllipseShapeFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/EllipseShapeFixture.cs index cb9e17eedc..df17b8f470 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/EllipseShapeFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/EllipseShapeFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 04.10.2009 - * Zeit: 11:36 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/LineShapeFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/LineShapeFixture.cs index 23eaaa40f8..b67d591710 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/LineShapeFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/LineShapeFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2009 - * Zeit: 11:35 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/RectangleShapeFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/RectangleShapeFixture.cs index c8bc7645db..9ff3abd2ec 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/RectangleShapeFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/Shapes/RectangleShapeFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 03.10.2009 - * Zeit: 12:08 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs index 4fd885e081..3f00390e0c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.07.2009 - * Zeit: 19:59 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Drawing; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Properties/AssemblyInfo.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Properties/AssemblyInfo.cs index 2ee9508d8b..d3aa2cf4e0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Properties/AssemblyInfo.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Properties/AssemblyInfo.cs @@ -1,4 +1,7 @@ -#region Using directives +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +#region Using directives using System; using System.Reflection; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportModelFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportModelFixture.cs index 20d1aab34c..04199faa5a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportModelFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportModelFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 30.10.2008 - * Zeit: 20:09 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs index 54ec7ef20f..e8eb080f6a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 26.10.2008 - * Zeit: 18:28 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs index fed9f676e5..4dc2836d5a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter Forstmeier - * Datum: 06.12.2009 - * Zeit: 19:17 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Core.Test.TestHelpers; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/FunctionsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/FunctionsFixture.cs index 0a7d2b63f2..60d7a64af2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/FunctionsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/FunctionsFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 02.06.2009 - * Zeit: 19:51 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs index 74bda902ae..a37cd7d0f7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 13.07.2009 - * Zeit: 19:36 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs index ccb11cccb4..c08b118dae 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 24.07.2009 - * Zeit: 20:08 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs index e95ff34c32..b863eeaefb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs @@ -1,11 +1,5 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 02.06.2010 - * Time: 19:08 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs index 76f6450874..b1b8eef157 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 06.07.2009 - * Zeit: 19:56 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs index a5a4e934ef..94a9e936b8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 12.06.2009 - * Zeit: 20:06 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs index b674761642..df21f8dca1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 10.06.2009 - * Zeit: 19:24 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/UserFunctionsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/UserFunctionsFixture.cs index b5eb2c3e2f..f850e8b031 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/UserFunctionsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/UserFunctionsFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 12.06.2009 - * Zeit: 19:49 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/AggregateFunctionsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/AggregateFunctionsFixture.cs index fbdee18594..d4a66267a3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/AggregateFunctionsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/AggregateFunctionsFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 13.07.2009 - * Zeit: 19:28 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using ICSharpCode.Reports.Expressions.ReportingLanguage; using System; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/ConditionalFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/ConditionalFixture.cs index 6af40c4a94..4c0c5b384c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/ConditionalFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/ConditionalFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.06.2009 - * Zeit: 11:23 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; @@ -66,4 +60,4 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.LanguageTests } } -} +} \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/PropertyEvaluator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/PropertyEvaluator.cs index 00956e1670..9d71693b52 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/PropertyEvaluator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/PropertyEvaluator.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 07.06.2009 - * Zeit: 13:35 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleCompilerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleCompilerFixture.cs index 3671bbc73c..5863e43314 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleCompilerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleCompilerFixture.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 30.05.2009 - * Zeit: 19:10 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleMath.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleMath.cs index 14f7c50ed9..870bb88b5f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleMath.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/SimpleMath.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 31.05.2009 - * Zeit: 19:48 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/StringConcat.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/StringConcat.cs index 428915e8b6..e3943c57ce 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/StringConcat.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/LanguageTests/StringConcat.cs @@ -1,11 +1,5 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 01.06.2009 - * Zeit: 18:55 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; using ICSharpCode.Reports.Expressions.ReportingLanguage; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs index ba427109d6..34113cb48f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 12.06.2009 - * Zeit: 20:09 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; namespace ICSharpCode.Reports.Core.Test.ReportingLanguage diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/AggregateFuctionHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/AggregateFuctionHelper.cs index 2228f75f72..3ea9331869 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/AggregateFuctionHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/AggregateFuctionHelper.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 28.07.2009 - * Zeit: 19:27 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.Data; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ConcernOf.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ConcernOf.cs index 3b4f07816c..2a8719712c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ConcernOf.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ConcernOf.cs @@ -1,11 +1,6 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 07.05.2010 - * Time: 19:25 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using NUnit.Framework; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs index 0cb95050a5..cfad666d05 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs @@ -1,11 +1,6 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 24.07.2009 - * Zeit: 19:13 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + using System; using System.Collections.Generic; using System.Data; From 3d402731a6527045df807bbdbaa5f4ab8aca5158 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 24 Sep 2010 14:06:10 +0200 Subject: [PATCH 18/33] Fixed NullReferenceException in AbstractBuildOptions.InitTargetFramework. --- .../OptionPanels/ProjectOptions/AbstractBuildOptions.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs index 340ce8ff57..c779aeea81 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs @@ -243,8 +243,11 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels ComboBox targetFrameworkComboBox = ControlDictionary["targetFrameworkComboBox"] as ComboBox; if (targetFrameworkComboBox != null) { targetFrameworkComboBox.Enabled = false; - targetFrameworkComboBox.Items.Add(((IUpgradableProject)project).CurrentTargetFramework.DisplayName); - targetFrameworkComboBox.SelectedIndex = 0; + TargetFramework fx = ((IUpgradableProject)project).CurrentTargetFramework; + if (fx != null) { + targetFrameworkComboBox.Items.Add(fx.DisplayName); + targetFrameworkComboBox.SelectedIndex = 0; + } } } } From ee134f91a4438c65a8478b2320f2b1e11b489e7b Mon Sep 17 00:00:00 2001 From: mrward Date: Fri, 24 Sep 2010 23:24:50 +0100 Subject: [PATCH 19/33] Change IronPython and IronRuby Run without Debugger menu option to pause the console output after the run is complete. --- .../Project/Src/RunPythonCommand.cs | 3 +- .../Test/Gui/RunPythonCommandTests.cs | 8 ++--- .../BackendBindings/Ruby/RubyBinding.sln | 2 +- .../RubyBinding/Project/Src/RunRubyCommand.cs | 6 ++-- ...Fixture.cs => DebugRunRubyCommandTests.cs} | 25 ++++++++----- .../Test/Gui/RunRubyCommandTests.cs | 33 ++++++++++------- .../RubyBinding/Test/RubyBinding.Tests.csproj | 2 +- .../Project/ICSharpCode.Scripting.csproj | 1 + .../Src/PauseCommandPromptProcessStartInfo.cs | 35 +++++++++++++++++++ 9 files changed, 85 insertions(+), 30 deletions(-) rename src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/{DebugRunRubyCommandTestFixture.cs => DebugRunRubyCommandTests.cs} (58%) create mode 100644 src/AddIns/BackendBindings/Scripting/Project/Src/PauseCommandPromptProcessStartInfo.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs index 537af6fed3..21efb99590 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs @@ -48,7 +48,8 @@ namespace ICSharpCode.PythonBinding if (Debug) { debugger.Start(processStartInfo); } else { - debugger.StartWithoutDebugging(processStartInfo); + PauseCommandPromptProcessStartInfo pauseCommandPrompt = new PauseCommandPromptProcessStartInfo(processStartInfo); + debugger.StartWithoutDebugging(pauseCommandPrompt.ProcessStartInfo); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs index 735e5820c9..b4ec3ed7a7 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs @@ -50,18 +50,18 @@ namespace PythonBinding.Tests.Gui } [Test] - public void Run_PythonFileOpen_IronPythonConsoleFileNamePassedToDebugger() + public void Run_PythonFileOpen_CommandPromptExePassedToDebugger() { string fileName = debugger.ProcessStartInfo.FileName; - string expectedFileName = @"C:\IronPython\ipy.exe"; + string expectedFileName = "cmd.exe"; Assert.AreEqual(expectedFileName, fileName); } [Test] - public void Run_PythonFileOpen_PythonFileNamePassedToIronPythonConsole() + public void Run_PythonFileOpen_IronPythonConsoleAndPythonFileNameAndPausePassedAsCommandLineArguments() { string args = debugger.ProcessStartInfo.Arguments; - string expectedArgs = "\"C:\\Projects\\test.py\""; + string expectedArgs = "/c \"C:\\IronPython\\ipy.exe \"C:\\Projects\\test.py\"\" & pause"; Assert.AreEqual(expectedArgs, args); } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding.sln b/src/AddIns/BackendBindings/Ruby/RubyBinding.sln index 1d6ead6566..9b9b36cd2b 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding.sln +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.6511 +# SharpDevelop 4.0.0.6676 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding.Tests", "RubyBinding\Test\RubyBinding.Tests.csproj", "{01DF0475-0CB2-4E81-971B-BADC60CDE3A5}" diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs index 9ea1393432..2026888771 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs @@ -43,10 +43,12 @@ namespace ICSharpCode.RubyBinding public override void Run() { + ProcessStartInfo processStartInfo = CreateProcessStartInfo(); if (debug) { - debugger.Start(CreateProcessStartInfo()); + debugger.Start(processStartInfo); } else { - debugger.StartWithoutDebugging(CreateProcessStartInfo()); + PauseCommandPromptProcessStartInfo commandPrompt = new PauseCommandPromptProcessStartInfo(processStartInfo); + debugger.StartWithoutDebugging(commandPrompt.ProcessStartInfo); } } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs similarity index 58% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs rename to src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs index 3f7793919b..ecbbddc4ab 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs @@ -13,13 +13,13 @@ using RubyBinding.Tests.Utils; namespace RubyBinding.Tests.Gui { [TestFixture] - public class DebugRubyCommandTestFixture + public class DebugRubyCommandTests { MockDebugger debugger; RunDebugRubyCommand command; - [TestFixtureSetUp] - public void SetUpFixture() + [SetUp] + public void Init() { MockWorkbench workbench = MockWorkbench.CreateWorkbenchWithOneViewContent(@"C:\Projects\test.rb"); @@ -33,21 +33,28 @@ namespace RubyBinding.Tests.Gui } [Test] - public void DebuggerStartMethodCalled() + public void Run_RubyFileOpen_DebuggerStartMethodCalled() { - Assert.IsTrue(debugger.StartMethodCalled); + bool startMethodCalled = debugger.StartMethodCalled; + Assert.IsTrue(startMethodCalled); } [Test] - public void ProcessInfoFileNameContainsPathToIronRubyConsole() + public void Run_RubyFileOpen_ProcessInfoFileNameContainsPathToIronRubyConsole() { - Assert.AreEqual(@"C:\IronRuby\ir.exe", debugger.ProcessStartInfo.FileName); + string fileName = debugger.ProcessStartInfo.FileName; + string expectedFileName = @"C:\IronRuby\ir.exe"; + + Assert.AreEqual(expectedFileName, fileName); } [Test] - public void ProcessInfoArgsHasDebugArgument() + public void Run_RubyFileOpen_ProcessInfoArgsHasDebugArgument() { - Assert.AreEqual("-D test.rb", debugger.ProcessStartInfo.Arguments); + string arguments = debugger.ProcessStartInfo.Arguments; + string expectedArguments = "-D test.rb"; + + Assert.AreEqual(expectedArguments, arguments); } } } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs index 30d6cd92f7..bafa270e62 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs @@ -22,8 +22,8 @@ namespace RubyBinding.Tests.Gui MockDebugger debugger; RunRubyCommand command; - [TestFixtureSetUp] - public void SetUpFixture() + [SetUp] + public void Init() { MockWorkbench workbench = MockWorkbench.CreateWorkbenchWithOneViewContent(@"C:\Projects\test.rb"); @@ -37,33 +37,42 @@ namespace RubyBinding.Tests.Gui } [Test] - public void RunRubyCommandIsAbstractCommand() + public void Run_RubyFileOpen_RubyCommandIsAbstractCommand() { - Assert.IsNotNull(command as AbstractCommand); + AbstractCommand abstractCommand = command as AbstractCommand; + Assert.IsNotNull(abstractCommand); } [Test] - public void DebuggerStartWithoutDebuggingMethodCalled() + public void Run_RubyFileOpen_DebuggerStartWithoutDebuggingMethodCalled() { - Assert.IsTrue(debugger.StartWithoutDebuggingMethodCalled); + bool startCalled = debugger.StartWithoutDebuggingMethodCalled; + Assert.IsTrue(startCalled); } [Test] - public void ProcessInfoFileNameIsIronRubyConsole() + public void Run_RubyFileOpen_ProcessInfoFileNameIsIronRubyConsole() { - Assert.AreEqual(@"C:\IronRuby\ir.exe", debugger.ProcessStartInfo.FileName); + string fileName = debugger.ProcessStartInfo.FileName; + string expectedFileName = "cmd.exe"; + Assert.AreEqual(expectedFileName, fileName); } [Test] - public void ProcessInfoArgsContainsFileNameActiveInTextEditor() + public void Run_RubyFileOpen_ProcessInfoArgsContainsFileNameActiveInTextEditor() { - Assert.AreEqual("test.rb", debugger.ProcessStartInfo.Arguments); + string arguments = debugger.ProcessStartInfo.Arguments; + string expectedArguments = "/c \"C:\\IronRuby\\ir.exe test.rb\" & pause"; + + Assert.AreEqual(expectedArguments, arguments); } [Test] - public void WorkingDirectoryIsSameDirectoryAsFileBeingRun() + public void Run_RubyFileOpen_WorkingDirectoryIsSameDirectoryAsFileBeingRun() { - Assert.AreEqual(@"C:\Projects", debugger.ProcessStartInfo.WorkingDirectory); + string directory = debugger.ProcessStartInfo.WorkingDirectory; + string expectedDirectory = @"C:\Projects"; + Assert.AreEqual(expectedDirectory, directory); } } } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj index 2358666116..67796542f2 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj @@ -266,7 +266,7 @@ - + diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj index cebf3e982f..3d692cc779 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -80,6 +80,7 @@ + diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/PauseCommandPromptProcessStartInfo.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/PauseCommandPromptProcessStartInfo.cs new file mode 100644 index 0000000000..15f98267df --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/PauseCommandPromptProcessStartInfo.cs @@ -0,0 +1,35 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Diagnostics; + +namespace ICSharpCode.Scripting +{ + public class PauseCommandPromptProcessStartInfo + { + ProcessStartInfo processStartInfo; + + public PauseCommandPromptProcessStartInfo(ProcessStartInfo processStartInfo) + { + this.processStartInfo = processStartInfo; + ChangeProcessStartInfoToPauseCommandPrompt(); + } + + public ProcessStartInfo ProcessStartInfo { + get { return processStartInfo; } + } + + void ChangeProcessStartInfoToPauseCommandPrompt() + { + processStartInfo.Arguments = GetArguments(); + processStartInfo.FileName = "cmd.exe"; + } + + string GetArguments() + { + return String.Format("/c \"{0} {1}\" & pause", + processStartInfo.FileName, processStartInfo.Arguments); + } + } +} From fc508ad1743790f716a270c43bf1bee97e32fb6b Mon Sep 17 00:00:00 2001 From: mrward Date: Sat, 25 Sep 2010 13:54:57 +0100 Subject: [PATCH 20/33] Move common IronRuby and IronPython console application code to Scripting project. --- .../Project/Src/PythonConsoleApplication.cs | 85 ++--------------- .../Src/PythonTestRunnerApplication.cs | 4 +- .../Project/Src/RunPythonCommand.cs | 2 +- .../Test/PythonBinding.Tests.csproj | 2 +- ...re.cs => PythonConsoleApplicationTests.cs} | 43 +++++---- .../Project/Src/RubyConsoleApplication.cs | 91 +++---------------- .../Project/Src/RubyTestRunnerApplication.cs | 6 +- .../RubyBinding/Project/Src/RunRubyCommand.cs | 27 ++---- .../Test/Gui/DebugRunRubyCommandTests.cs | 2 +- .../Test/Gui/RunRubyCommandTests.cs | 2 +- .../RubyBinding/Test/RubyBinding.Tests.csproj | 2 +- ...ture.cs => RubyConsoleApplicationTests.cs} | 37 ++++---- .../Project/ICSharpCode.Scripting.csproj | 2 + .../Src/ScriptingCommandLineBuilder.cs | 54 +++++++++++ .../Src/ScriptingConsoleApplication.cs | 52 +++++++++++ 15 files changed, 190 insertions(+), 221 deletions(-) rename src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/{PythonConsoleApplicationTestFixture.cs => PythonConsoleApplicationTests.cs} (52%) rename src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/{RubyConsoleApplicationTestFixture.cs => RubyConsoleApplicationTests.cs} (58%) create mode 100644 src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCommandLineBuilder.cs create mode 100644 src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingConsoleApplication.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleApplication.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleApplication.cs index 937556d01d..01797852f4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleApplication.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsoleApplication.cs @@ -4,97 +4,28 @@ using System; using System.Diagnostics; using System.Text; +using ICSharpCode.Scripting; namespace ICSharpCode.PythonBinding { - public class PythonConsoleApplication + public class PythonConsoleApplication : ScriptingConsoleApplication { PythonAddInOptions options; - StringBuilder arguments; - bool debug; - string pythonScriptFileName = String.Empty; - string pythonScriptCommandLineArguments = String.Empty; - string workingDirectory = String.Empty; public PythonConsoleApplication(PythonAddInOptions options) { this.options = options; } - public string FileName { + public override string FileName { get { return options.PythonFileName; } } - - public bool Debug { - get { return debug; } - set { debug = value; } - } - - public string PythonScriptFileName { - get { return pythonScriptFileName; } - set { pythonScriptFileName = value; } - } - - public string PythonScriptCommandLineArguments { - get { return pythonScriptCommandLineArguments; } - set { pythonScriptCommandLineArguments = value; } - } - - public string WorkingDirectory { - get { return workingDirectory; } - set { workingDirectory = value; } - } - - public ProcessStartInfo GetProcessStartInfo() - { - ProcessStartInfo processStartInfo = new ProcessStartInfo(); - processStartInfo.FileName = FileName; - processStartInfo.Arguments = GetArguments(); - processStartInfo.WorkingDirectory = workingDirectory; - return processStartInfo; - } - - public string GetArguments() - { - arguments = new StringBuilder(); - - AppendBooleanOptionIfTrue("-X:Debug", debug); - AppendQuotedStringIfNotEmpty(pythonScriptFileName); - AppendStringIfNotEmpty(pythonScriptCommandLineArguments); - - return arguments.ToString().TrimEnd(); - } - - void AppendBooleanOptionIfTrue(string option, bool flag) - { - if (flag) { - AppendOption(option); - } - } - - void AppendOption(string option) - { - arguments.Append(option + " "); - } - - void AppendQuotedStringIfNotEmpty(string option) - { - if (!String.IsNullOrEmpty(option)) { - AppendQuotedString(option); - } - } - - void AppendQuotedString(string option) - { - string quotedOption = String.Format("\"{0}\"", option); - AppendOption(quotedOption); - } - - void AppendStringIfNotEmpty(string option) + + protected override void AddArguments(ScriptingCommandLineBuilder commandLine) { - if (!String.IsNullOrEmpty(option)) { - AppendOption(option); - } + commandLine.AppendBooleanOptionIfTrue("-X:Debug", Debug); + commandLine.AppendQuotedStringIfNotEmpty(ScriptFileName); + commandLine.AppendStringIfNotEmpty(ScriptCommandLineArguments); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs index 2641dded3e..8b2b80ea61 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonTestRunnerApplication.cs @@ -83,8 +83,8 @@ namespace ICSharpCode.PythonBinding public ProcessStartInfo CreateProcessStartInfo(SelectedTests selectedTests) { - consoleApplication.PythonScriptFileName = GetSharpDevelopTestPythonScriptFileName(); - consoleApplication.PythonScriptCommandLineArguments = GetResponseFileNameCommandLineArgument(); + consoleApplication.ScriptFileName = GetSharpDevelopTestPythonScriptFileName(); + consoleApplication.ScriptCommandLineArguments = GetResponseFileNameCommandLineArgument(); consoleApplication.WorkingDirectory = selectedTests.Project.Directory; return consoleApplication.GetProcessStartInfo(); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs index 21efb99590..7f8d1e75a3 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs @@ -56,7 +56,7 @@ namespace ICSharpCode.PythonBinding ProcessStartInfo GetProcessStartInfo() { string scriptFileName = workbench.ActiveViewContent.PrimaryFileName; - ipy.PythonScriptFileName = scriptFileName; + ipy.ScriptFileName = scriptFileName; ipy.WorkingDirectory = Path.GetDirectoryName(scriptFileName); return ipy.GetProcessStartInfo(); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 07640e3197..f028a53657 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -397,7 +397,7 @@ - + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonConsoleApplicationTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonConsoleApplicationTests.cs similarity index 52% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonConsoleApplicationTestFixture.cs rename to src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonConsoleApplicationTests.cs index fe6b44fda4..c9c4efe1cc 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonConsoleApplicationTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonConsoleApplicationTests.cs @@ -11,7 +11,7 @@ using PythonBinding.Tests.Utils; namespace PythonBinding.Tests.Testing { [TestFixture] - public class PythonConsoleApplicationTestFixture + public class PythonConsoleApplicationTests { PythonConsoleApplication app; PythonAddInOptions options; @@ -25,44 +25,48 @@ namespace PythonBinding.Tests.Testing } [Test] - public void FileNameIsPythonFileNameFromAddInOptions() + public void FileName_NewInstance_FileNameIsPythonFileNameFromAddInOptions() { + string fileName = app.FileName; string expectedFileName = @"C:\IronPython\ipy.exe"; - Assert.AreEqual(expectedFileName, app.FileName); + Assert.AreEqual(expectedFileName, fileName); } [Test] - public void GetArgumentsReturnsDebugOptionWhenDebugIsTrue() + public void GetArguments_DebugIsTrue_ReturnsDebugOption() { app.Debug = true; + string args = app.GetArguments(); string expectedCommandLine = "-X:Debug"; - Assert.AreEqual(expectedCommandLine, app.GetArguments()); + Assert.AreEqual(expectedCommandLine, args); } [Test] - public void GetArgumentsReturnsQuotedPythonScriptFileName() + public void GetArguments_ScriptFileNameSet_ReturnsQuotedPythonScriptFileName() { - app.PythonScriptFileName = @"d:\projects\my ipy\test.py"; + app.ScriptFileName = @"d:\projects\my ipy\test.py"; + string args = app.GetArguments(); string expectedCommandLine = "\"d:\\projects\\my ipy\\test.py\""; - Assert.AreEqual(expectedCommandLine, app.GetArguments()); + Assert.AreEqual(expectedCommandLine, args); } [Test] - public void GetArgumentsReturnsQuotedPythonScriptFileNameAndItsCommandLineArguments() + public void GetArguments_ScriptFileNameAndScriptCommandLineArgsSet_ReturnsQuotedPythonScriptFileNameAndItsCommandLineArguments() { app.Debug = true; - app.PythonScriptFileName = @"d:\projects\my ipy\test.py"; - app.PythonScriptCommandLineArguments = "@responseFile.txt -def"; + app.ScriptFileName = @"d:\projects\my ipy\test.py"; + app.ScriptCommandLineArguments = "@responseFile.txt -def"; + string args = app.GetArguments(); string expectedCommandLine = "-X:Debug \"d:\\projects\\my ipy\\test.py\" @responseFile.txt -def"; - Assert.AreEqual(expectedCommandLine, app.GetArguments()); + Assert.AreEqual(expectedCommandLine, args); } [Test] - public void GetProcessStartInfoHasFileNameThatEqualsIronPythonConsoleApplicationExeFileName() + public void GetProcessStartInfo_NewInstance_ReturnsProcessStartInfoWithFileNameThatEqualsIronPythonConsoleApplicationExeFileName() { ProcessStartInfo startInfo = app.GetProcessStartInfo(); string expectedFileName = @"C:\IronPython\ipy.exe"; @@ -71,7 +75,7 @@ namespace PythonBinding.Tests.Testing } [Test] - public void GetProcessStartInfoHasDebugFlagSetInArguments() + public void GetProcessStartInfo_DebugIsTrue_ReturnsProcessStartInfoWithDebugFlagSetInArguments() { app.Debug = true; ProcessStartInfo startInfo = app.GetProcessStartInfo(); @@ -81,20 +85,21 @@ namespace PythonBinding.Tests.Testing } [Test] - public void GetProcessStartInfoHasWorkingDirectoryIfSet() + public void GetProcessStartInfo_WorkingDirectorySet_ReturnsProcessStartInfoWithMatchingWorkingDirectory() { app.WorkingDirectory = @"d:\temp"; ProcessStartInfo startInfo = app.GetProcessStartInfo(); - Assert.AreEqual(@"d:\temp", startInfo.WorkingDirectory); + string expectedDirectory = @"d:\temp"; + Assert.AreEqual(expectedDirectory, startInfo.WorkingDirectory); } [Test] - public void ChangingOptionsPythonFileNameChangesProcessStartInfoFileName() + public void GetProcessStartInfo_ChangingPythonOptionsFileName_ProcessStartInfoFileNameMatchesChange() { options.PythonFileName = @"d:\temp\test\ipy.exe"; ProcessStartInfo startInfo = app.GetProcessStartInfo(); - - Assert.AreEqual(@"d:\temp\test\ipy.exe", startInfo.FileName); + string expectedFileName = @"d:\temp\test\ipy.exe"; + Assert.AreEqual(expectedFileName, startInfo.FileName); } } } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleApplication.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleApplication.cs index d32bcbc60f..84603d0867 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleApplication.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyConsoleApplication.cs @@ -6,110 +6,41 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; +using ICSharpCode.Scripting; + namespace ICSharpCode.RubyBinding { - public class RubyConsoleApplication + public class RubyConsoleApplication : ScriptingConsoleApplication { RubyAddInOptions options; - bool debug; List loadPaths = new List(); - string rubyScriptFileName = String.Empty; - string rubyScriptCommandLineArguments = String.Empty; - string workingDirectory = String.Empty; - string loadPath = String.Empty; - StringBuilder arguments; public RubyConsoleApplication(RubyAddInOptions options) { this.options = options; } - public string FileName { + public override string FileName { get { return options.RubyFileName; } } - public bool Debug { - get { return debug; } - set { debug = value; } - } - public void AddLoadPath(string path) { loadPaths.Add(path); } - public string RubyScriptFileName { - get { return rubyScriptFileName; } - set { rubyScriptFileName = value; } - } - - public string RubyScriptCommandLineArguments { - get { return rubyScriptCommandLineArguments; } - set { rubyScriptCommandLineArguments = value; } - } - - public string WorkingDirectory { - get { return workingDirectory; } - set { workingDirectory = value; } - } - - public ProcessStartInfo GetProcessStartInfo() - { - ProcessStartInfo processStartInfo = new ProcessStartInfo(); - processStartInfo.FileName = FileName; - processStartInfo.Arguments = GetArguments(); - processStartInfo.WorkingDirectory = workingDirectory; - return processStartInfo; - } - - public string GetArguments() - { - arguments = new StringBuilder(); - - AppendBooleanOptionIfTrue("-D", debug); - AppendLoadPaths(); - AppendQuotedStringIfNotEmpty(rubyScriptFileName); - AppendStringIfNotEmpty(rubyScriptCommandLineArguments); - - return arguments.ToString().TrimEnd(); - } - - void AppendBooleanOptionIfTrue(string option, bool flag) + protected override void AddArguments(ScriptingCommandLineBuilder commandLine) { - if (flag) { - AppendOption(option); - } - } - - void AppendOption(string option) - { - arguments.Append(option + " "); + commandLine.AppendBooleanOptionIfTrue("-D", Debug); + AppendLoadPaths(commandLine); + commandLine.AppendQuotedStringIfNotEmpty(ScriptFileName); + commandLine.AppendStringIfNotEmpty(ScriptCommandLineArguments); } - void AppendLoadPaths() + void AppendLoadPaths(ScriptingCommandLineBuilder commandLine) { foreach (string path in loadPaths) { - AppendQuotedString("-I" + path); - } - } - - void AppendQuotedStringIfNotEmpty(string option) - { - if (!String.IsNullOrEmpty(option)) { - AppendQuotedString(option); - } - } - - void AppendQuotedString(string option) - { - string quotedOption = String.Format("\"{0}\"", option); - AppendOption(quotedOption); - } - - void AppendStringIfNotEmpty(string option) - { - if (!String.IsNullOrEmpty(option)) { - AppendOption(option); + commandLine.AppendQuotedString("-I" + path); } } } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs index 54fe17b63d..b77123dc38 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RubyTestRunnerApplication.cs @@ -66,9 +66,9 @@ namespace ICSharpCode.RubyBinding public ProcessStartInfo CreateProcessStartInfo(SelectedTests selectedTests) { - consoleApplication.RubyScriptFileName = GetSharpDevelopTestRubyScriptFileName(); + consoleApplication.ScriptFileName = GetSharpDevelopTestRubyScriptFileName(); AddLoadPaths(selectedTests.Project); - consoleApplication.RubyScriptCommandLineArguments = GetCommandLineArguments(selectedTests); + consoleApplication.ScriptCommandLineArguments = GetCommandLineArguments(selectedTests); consoleApplication.WorkingDirectory = selectedTests.Project.Directory; return consoleApplication.GetProcessStartInfo(); } @@ -84,7 +84,7 @@ namespace ICSharpCode.RubyBinding if (options.HasRubyLibraryPath) { consoleApplication.AddLoadPath(options.RubyLibraryPath); } - string testRunnerLoadPath = Path.GetDirectoryName(consoleApplication.RubyScriptFileName); + string testRunnerLoadPath = Path.GetDirectoryName(consoleApplication.ScriptFileName); consoleApplication.AddLoadPath(testRunnerLoadPath); } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs index 2026888771..e744fc2853 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs @@ -22,7 +22,7 @@ namespace ICSharpCode.RubyBinding IDebugger debugger; RubyAddInOptions options; IScriptingWorkbench workbench; - bool debug; + RubyConsoleApplication rubyConsoleApplication; public RunRubyCommand() : this(new RubyWorkbench(), new RubyAddInOptions(), DebuggerService.CurrentDebugger) @@ -34,17 +34,18 @@ namespace ICSharpCode.RubyBinding this.workbench = workbench; this.debugger = debugger; this.options = options; + rubyConsoleApplication = new RubyConsoleApplication(options); } public bool Debug { - get { return debug; } - set { debug = value; } + get { return rubyConsoleApplication.Debug; } + set { rubyConsoleApplication.Debug = value; } } public override void Run() { ProcessStartInfo processStartInfo = CreateProcessStartInfo(); - if (debug) { + if (Debug) { debugger.Start(processStartInfo); } else { PauseCommandPromptProcessStartInfo commandPrompt = new PauseCommandPromptProcessStartInfo(processStartInfo); @@ -54,12 +55,9 @@ namespace ICSharpCode.RubyBinding ProcessStartInfo CreateProcessStartInfo() { - ProcessStartInfo info = new ProcessStartInfo(); - info.FileName = options.RubyFileName; - info.Arguments = GetArguments(); - info.WorkingDirectory = GetWorkingDirectory(); - - return info; + rubyConsoleApplication.ScriptFileName = GetRubyScriptFileName(); + rubyConsoleApplication.WorkingDirectory = GetWorkingDirectory(); + return rubyConsoleApplication.GetProcessStartInfo(); } string GetWorkingDirectory() @@ -71,15 +69,6 @@ namespace ICSharpCode.RubyBinding get { return workbench.ActiveViewContent.PrimaryFileName; } } - string GetArguments() - { - string args = GetRubyScriptFileName(); - if (Debug) { - return "-D " + args; - } - return args; - } - string GetRubyScriptFileName() { return Path.GetFileName(WorkbenchPrimaryFileName); diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs index ecbbddc4ab..1f8fd8ccac 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/DebugRunRubyCommandTests.cs @@ -52,7 +52,7 @@ namespace RubyBinding.Tests.Gui public void Run_RubyFileOpen_ProcessInfoArgsHasDebugArgument() { string arguments = debugger.ProcessStartInfo.Arguments; - string expectedArguments = "-D test.rb"; + string expectedArguments = "-D \"test.rb\""; Assert.AreEqual(expectedArguments, arguments); } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs index bafa270e62..1ba2d2d20e 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Gui/RunRubyCommandTests.cs @@ -62,7 +62,7 @@ namespace RubyBinding.Tests.Gui public void Run_RubyFileOpen_ProcessInfoArgsContainsFileNameActiveInTextEditor() { string arguments = debugger.ProcessStartInfo.Arguments; - string expectedArguments = "/c \"C:\\IronRuby\\ir.exe test.rb\" & pause"; + string expectedArguments = "/c \"C:\\IronRuby\\ir.exe \"test.rb\"\" & pause"; Assert.AreEqual(expectedArguments, arguments); } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj index 67796542f2..1d31f9d487 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj @@ -289,7 +289,7 @@ - + diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyConsoleApplicationTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyConsoleApplicationTests.cs similarity index 58% rename from src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyConsoleApplicationTestFixture.cs rename to src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyConsoleApplicationTests.cs index 21ed0b8c09..02e43e0ff0 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyConsoleApplicationTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyConsoleApplicationTests.cs @@ -11,7 +11,7 @@ using RubyBinding.Tests.Utils; namespace RubyBinding.Tests.Testing { [TestFixture] - public class RubyConsoleApplicationTestFixture + public class RubyConsoleApplicationTests { RubyConsoleApplication app; RubyAddInOptions options; @@ -25,44 +25,49 @@ namespace RubyBinding.Tests.Testing } [Test] - public void FileNameIsRubyFileNameFromAddInOptions() + public void FileName_NewInstance_FileNameIsRubyFileNameFromAddInOptions() { + string fileName = app.FileName; string expectedFileName = @"C:\IronRuby\ir.exe"; - Assert.AreEqual(expectedFileName, app.FileName); + Assert.AreEqual(expectedFileName, fileName); } [Test] - public void GetArgumentsReturnsDebugOptionWhenDebugIsTrue() + public void GetArguments_DebugIsTrue_ReturnsDebugOption() { app.Debug = true; + string args = app.GetArguments(); string expectedCommandLine = "-D"; - Assert.AreEqual(expectedCommandLine, app.GetArguments()); + Assert.AreEqual(expectedCommandLine, args); } [Test] - public void GetArgumentsReturnsQuotedRubyScriptFileName() + public void GetArguments_ScriptFileNameIsSet_ReturnsQuotedRubyScriptFileName() { - app.RubyScriptFileName = @"d:\projects\my ruby\test.rb"; + app.ScriptFileName = @"d:\projects\my ruby\test.rb"; + string args = app.GetArguments(); string expectedCommandLine = "\"d:\\projects\\my ruby\\test.rb\""; - Assert.AreEqual(expectedCommandLine, app.GetArguments()); + Assert.AreEqual(expectedCommandLine, args); } [Test] - public void GetArgumentsReturnsQuotedRubyScriptFileNameAndItsCommandLineArguments() + public void GetArguments_ScriptFileNameAndScriptCommandLineArgumentsSet_ReturnsQuotedRubyScriptFileNameAndItsCommandLineArguments() { app.Debug = true; - app.RubyScriptFileName = @"d:\projects\my ruby\test.rb"; - app.RubyScriptCommandLineArguments = "-- responseFile.txt"; + app.ScriptFileName = @"d:\projects\my ruby\test.rb"; + app.ScriptCommandLineArguments = "-- responseFile.txt"; + string args = app.GetArguments(); + string expectedCommandLine = "-D \"d:\\projects\\my ruby\\test.rb\" -- responseFile.txt"; - Assert.AreEqual(expectedCommandLine, app.GetArguments()); + Assert.AreEqual(expectedCommandLine, args); } [Test] - public void GetProcessStartInfoHasFileNameThatEqualsIronRubyConsoleApplicationExeFileName() + public void GetProcessStartInfo_NewInstance_HasFileNameThatEqualsIronRubyConsoleApplicationExeFileName() { ProcessStartInfo startInfo = app.GetProcessStartInfo(); string expectedFileName = @"C:\IronRuby\ir.exe"; @@ -71,7 +76,7 @@ namespace RubyBinding.Tests.Testing } [Test] - public void GetProcessStartInfoHasDebugFlagSetInArguments() + public void GetProcessStartInfo_DebugIsTrue_HasDebugFlagSetInArguments() { app.Debug = true; ProcessStartInfo startInfo = app.GetProcessStartInfo(); @@ -81,7 +86,7 @@ namespace RubyBinding.Tests.Testing } [Test] - public void GetProcessStartInfoHasWorkingDirectoryIfSet() + public void GetProcessStartInfo_WorkingDirectorySet_ProcessStartInfoHasMatchingWorkingDirectory() { app.WorkingDirectory = @"d:\temp"; ProcessStartInfo startInfo = app.GetProcessStartInfo(); @@ -89,7 +94,7 @@ namespace RubyBinding.Tests.Testing } [Test] - public void ChangingOptionsRubyFileNameChangesProcessStartInfoFileName() + public void GetProcessStartInfo_ChangingOptionsRubyFileName_ChangesProcessStartInfoFileName() { options.RubyFileName = @"d:\temp\test\ir.exe"; ProcessStartInfo startInfo = app.GetProcessStartInfo(); diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj index 3d692cc779..58282e9272 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -82,7 +82,9 @@ + + diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCommandLineBuilder.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCommandLineBuilder.cs new file mode 100644 index 0000000000..4ade27ea23 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingCommandLineBuilder.cs @@ -0,0 +1,54 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Text; + +namespace ICSharpCode.Scripting +{ + public class ScriptingCommandLineBuilder + { + StringBuilder commandLine = new StringBuilder(); + + public ScriptingCommandLineBuilder() + { + } + + public override string ToString() + { + return commandLine.ToString().TrimEnd(); + } + + public void AppendBooleanOptionIfTrue(string option, bool flag) + { + if (flag) { + AppendOption(option); + } + } + + public void AppendOption(string option) + { + commandLine.Append(option + " "); + } + + public void AppendQuotedStringIfNotEmpty(string option) + { + if (!String.IsNullOrEmpty(option)) { + AppendQuotedString(option); + } + } + + public void AppendQuotedString(string option) + { + string quotedOption = String.Format("\"{0}\"", option); + AppendOption(quotedOption); + } + + public void AppendStringIfNotEmpty(string option) + { + if (!String.IsNullOrEmpty(option)) { + AppendOption(option); + } + } + } +} diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingConsoleApplication.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingConsoleApplication.cs new file mode 100644 index 0000000000..8d126b87b9 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingConsoleApplication.cs @@ -0,0 +1,52 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Diagnostics; +using System.Text; + +namespace ICSharpCode.Scripting +{ + public abstract class ScriptingConsoleApplication + { + public ScriptingConsoleApplication() + { + WorkingDirectory = String.Empty; + ScriptFileName = String.Empty; + ScriptCommandLineArguments = String.Empty; + } + + public bool Debug { get; set; } + + /// + /// Console application filename. + /// + public virtual string FileName { get; set; } + + public string WorkingDirectory { get; set; } + + public string ScriptFileName { get; set; } + + public string ScriptCommandLineArguments { get; set; } + + public ProcessStartInfo GetProcessStartInfo() + { + ProcessStartInfo processStartInfo = new ProcessStartInfo(); + processStartInfo.FileName = FileName; + processStartInfo.Arguments = GetArguments(); + processStartInfo.WorkingDirectory = WorkingDirectory; + return processStartInfo; + } + + public string GetArguments() + { + ScriptingCommandLineBuilder commandLine = new ScriptingCommandLineBuilder(); + AddArguments(commandLine); + return commandLine.ToString(); + } + + protected virtual void AddArguments(ScriptingCommandLineBuilder commandLine) + { + } + } +} From c13289149252321dab2311038bb150e5b7c79936 Mon Sep 17 00:00:00 2001 From: mrward Date: Sat, 25 Sep 2010 14:51:31 +0100 Subject: [PATCH 21/33] Move common code for running the IronRuby or IronPython console from the menu to the Scripting project. --- .../Project/Src/RunDebugPythonCommand.cs | 3 - .../Project/Src/RunPythonCommand.cs | 42 +----------- ...tFixture.cs => DebugPythonCommandTests.cs} | 2 +- .../Test/Gui/RunPythonCommandTests.cs | 2 +- .../Test/PythonBinding.Tests.csproj | 2 +- .../RubyBinding/Project/Src/RunRubyCommand.cs | 51 +-------------- .../Project/ICSharpCode.Scripting.csproj | 1 + .../RunScriptingConsoleApplicationCommand.cs | 65 +++++++++++++++++++ 8 files changed, 74 insertions(+), 94 deletions(-) rename src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/{DebugPythonCommandTestFixture.cs => DebugPythonCommandTests.cs} (96%) create mode 100644 src/AddIns/BackendBindings/Scripting/Project/Src/RunScriptingConsoleApplicationCommand.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunDebugPythonCommand.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunDebugPythonCommand.cs index d61b6ebe10..fb384afaa7 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunDebugPythonCommand.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunDebugPythonCommand.cs @@ -2,11 +2,8 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using ICSharpCode.Core; using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Debugging; -using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Util; namespace ICSharpCode.PythonBinding { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs index 7f8d1e75a3..3748b65ab4 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/RunPythonCommand.cs @@ -2,14 +2,8 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Diagnostics; -using System.IO; - -using ICSharpCode.Core; using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Debugging; -using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Util; namespace ICSharpCode.PythonBinding { @@ -17,48 +11,16 @@ namespace ICSharpCode.PythonBinding /// Runs the Python console passing the filename of the /// active python script open in SharpDevelop. /// - public class RunPythonCommand : AbstractMenuCommand + public class RunPythonCommand : RunScriptingConsoleApplicationCommand { - IDebugger debugger; - PythonAddInOptions options; - IScriptingWorkbench workbench; - PythonConsoleApplication ipy; - public RunPythonCommand() : this(new PythonWorkbench(), new PythonAddInOptions(), DebuggerService.CurrentDebugger) { } public RunPythonCommand(IScriptingWorkbench workbench, PythonAddInOptions options, IDebugger debugger) + : base(workbench, debugger, new PythonConsoleApplication(options)) { - this.workbench = workbench; - this.debugger = debugger; - this.options = options; - ipy = new PythonConsoleApplication(options); - } - - public bool Debug { - get { return ipy.Debug; } - set { ipy.Debug = value; } - } - - public override void Run() - { - ProcessStartInfo processStartInfo = GetProcessStartInfo(); - if (Debug) { - debugger.Start(processStartInfo); - } else { - PauseCommandPromptProcessStartInfo pauseCommandPrompt = new PauseCommandPromptProcessStartInfo(processStartInfo); - debugger.StartWithoutDebugging(pauseCommandPrompt.ProcessStartInfo); - } - } - - ProcessStartInfo GetProcessStartInfo() - { - string scriptFileName = workbench.ActiveViewContent.PrimaryFileName; - ipy.ScriptFileName = scriptFileName; - ipy.WorkingDirectory = Path.GetDirectoryName(scriptFileName); - return ipy.GetProcessStartInfo(); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTests.cs similarity index 96% rename from src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs rename to src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTests.cs index af4215adb4..52a30a4ab9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/DebugPythonCommandTests.cs @@ -51,7 +51,7 @@ namespace PythonBinding.Tests.Gui public void Run_PythonFileOpen_DebugOptionsPassedToIronPythonConsole() { string args = debugger.ProcessStartInfo.Arguments; - string expectedArgs = "-X:Debug \"C:\\Projects\\test.py\""; + string expectedArgs = "-X:Debug \"test.py\""; Assert.AreEqual(expectedArgs, args); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs index b4ec3ed7a7..d1ebf7dea2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/RunPythonCommandTests.cs @@ -61,7 +61,7 @@ namespace PythonBinding.Tests.Gui public void Run_PythonFileOpen_IronPythonConsoleAndPythonFileNameAndPausePassedAsCommandLineArguments() { string args = debugger.ProcessStartInfo.Arguments; - string expectedArgs = "/c \"C:\\IronPython\\ipy.exe \"C:\\Projects\\test.py\"\" & pause"; + string expectedArgs = "/c \"C:\\IronPython\\ipy.exe \"test.py\"\" & pause"; Assert.AreEqual(expectedArgs, args); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index f028a53657..afe6b830dd 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -313,7 +313,7 @@ - + diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs index e744fc2853..2a69725588 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/Src/RunRubyCommand.cs @@ -17,61 +17,16 @@ namespace ICSharpCode.RubyBinding /// Runs the Ruby console passing the filename of the /// active Ruby script open in SharpDevelop. /// - public class RunRubyCommand : AbstractMenuCommand - { - IDebugger debugger; - RubyAddInOptions options; - IScriptingWorkbench workbench; - RubyConsoleApplication rubyConsoleApplication; - + public class RunRubyCommand : RunScriptingConsoleApplicationCommand + { public RunRubyCommand() : this(new RubyWorkbench(), new RubyAddInOptions(), DebuggerService.CurrentDebugger) { } public RunRubyCommand(IScriptingWorkbench workbench, RubyAddInOptions options, IDebugger debugger) + : base(workbench, debugger, new RubyConsoleApplication(options)) { - this.workbench = workbench; - this.debugger = debugger; - this.options = options; - rubyConsoleApplication = new RubyConsoleApplication(options); - } - - public bool Debug { - get { return rubyConsoleApplication.Debug; } - set { rubyConsoleApplication.Debug = value; } - } - - public override void Run() - { - ProcessStartInfo processStartInfo = CreateProcessStartInfo(); - if (Debug) { - debugger.Start(processStartInfo); - } else { - PauseCommandPromptProcessStartInfo commandPrompt = new PauseCommandPromptProcessStartInfo(processStartInfo); - debugger.StartWithoutDebugging(commandPrompt.ProcessStartInfo); - } - } - - ProcessStartInfo CreateProcessStartInfo() - { - rubyConsoleApplication.ScriptFileName = GetRubyScriptFileName(); - rubyConsoleApplication.WorkingDirectory = GetWorkingDirectory(); - return rubyConsoleApplication.GetProcessStartInfo(); - } - - string GetWorkingDirectory() - { - return Path.GetDirectoryName(WorkbenchPrimaryFileName); - } - - FileName WorkbenchPrimaryFileName { - get { return workbench.ActiveViewContent.PrimaryFileName; } - } - - string GetRubyScriptFileName() - { - return Path.GetFileName(WorkbenchPrimaryFileName); } } } diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj index 58282e9272..b37c760e48 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -81,6 +81,7 @@ + diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/RunScriptingConsoleApplicationCommand.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/RunScriptingConsoleApplicationCommand.cs new file mode 100644 index 0000000000..ee357dcc7a --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/RunScriptingConsoleApplicationCommand.cs @@ -0,0 +1,65 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using System.Diagnostics; +using System.IO; + +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop.Debugging; + +namespace ICSharpCode.Scripting +{ + public class RunScriptingConsoleApplicationCommand : AbstractMenuCommand + { + IDebugger debugger; + IScriptingWorkbench workbench; + ScriptingConsoleApplication scriptingConsoleApplication; + + public RunScriptingConsoleApplicationCommand(IScriptingWorkbench workbench, + IDebugger debugger, + ScriptingConsoleApplication scriptingConsoleApplication) + { + this.workbench = workbench; + this.debugger = debugger; + this.scriptingConsoleApplication = scriptingConsoleApplication; + } + + public bool Debug { + get { return scriptingConsoleApplication.Debug; } + set { scriptingConsoleApplication.Debug = value; } + } + + public override void Run() + { + ProcessStartInfo processStartInfo = CreateProcessStartInfo(); + if (Debug) { + debugger.Start(processStartInfo); + } else { + PauseCommandPromptProcessStartInfo commandPrompt = new PauseCommandPromptProcessStartInfo(processStartInfo); + debugger.StartWithoutDebugging(commandPrompt.ProcessStartInfo); + } + } + + ProcessStartInfo CreateProcessStartInfo() + { + scriptingConsoleApplication.ScriptFileName = GetScriptFileName(); + scriptingConsoleApplication.WorkingDirectory = GetWorkingDirectory(); + return scriptingConsoleApplication.GetProcessStartInfo(); + } + + string GetWorkingDirectory() + { + return Path.GetDirectoryName(WorkbenchPrimaryFileName); + } + + FileName WorkbenchPrimaryFileName { + get { return workbench.ActiveViewContent.PrimaryFileName; } + } + + string GetScriptFileName() + { + return Path.GetFileName(WorkbenchPrimaryFileName); + } + } +} From 938bc2dfdf8c8de3e49d176183db5bc0ddb55c70 Mon Sep 17 00:00:00 2001 From: mrward Date: Sat, 25 Sep 2010 19:17:30 +0100 Subject: [PATCH 22/33] Resolve IronPython local variables up to the current expression line and not beyond. --- .../Src/PythonLocalVariableResolver.cs | 27 ++++-- .../Project/Src/PythonResolverContext.cs | 12 +-- .../ResolveLocalClassInstanceTests.cs | 74 ++++++++++++++- .../Test/Utils/PythonResolverTestsHelper.cs | 5 + .../Project/ICSharpCode.Scripting.csproj | 1 + .../Project/Src/ScriptingLocalMethod.cs | 40 ++++++++ .../Test/ICSharpCode.Scripting.Tests.csproj | 2 + .../Resolver/ScriptingLocalMethodTests.cs | 91 +++++++++++++++++++ 8 files changed, 228 insertions(+), 24 deletions(-) create mode 100644 src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs create mode 100644 src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs index f9d148dce6..b6bd9b8a93 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs @@ -1,20 +1,21 @@ // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) -using Microsoft.Scripting; -using Microsoft.Scripting.Hosting; -using Microsoft.Scripting.Runtime; using System; using System.Collections.Generic; using System.Text; +using ICSharpCode.Scripting; using ICSharpCode.SharpDevelop.Dom; using IronPython; using IronPython.Compiler; using IronPython.Compiler.Ast; -using IronPython.Runtime; using IronPython.Hosting; +using IronPython.Runtime; using IronPython.Runtime.Exceptions; +using Microsoft.Scripting; +using Microsoft.Scripting.Hosting; +using Microsoft.Scripting.Runtime; namespace ICSharpCode.PythonBinding { @@ -54,7 +55,7 @@ namespace ICSharpCode.PythonBinding { this.variableName = variableName; ast.Walk(this); - return TypeName; + return TypeName; } public override bool Walk(AssignmentStatement node) @@ -116,22 +117,28 @@ namespace ICSharpCode.PythonBinding public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) { - return GetLocalVariable(resolverContext, expressionResult.Expression); + return GetLocalVariable(resolverContext, expressionResult); } /// /// Tries to find the type that matches the local variable name. /// - LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext, string expression) + LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext, ExpressionResult expressionResult) { - PythonLocalVariableResolver resolver = new PythonLocalVariableResolver(); - string typeName = resolver.Resolve(expression, resolverContext.FileContent); + string code = GetLocalMethodCode(resolverContext.FileContent, expressionResult); + string typeName = Resolve(expressionResult.Expression, code); if (typeName != null) { - return CreateLocalResolveResult(typeName, expression, resolverContext); + return CreateLocalResolveResult(typeName, expressionResult.Expression, resolverContext); } return null; } + string GetLocalMethodCode(string fullCode, ExpressionResult expressionResult) + { + ScriptingLocalMethod localMethod = new ScriptingLocalMethod(fullCode); + return localMethod.GetCode(expressionResult.Region.BeginLine); + } + LocalResolveResult CreateLocalResolveResult(string typeName, string identifier, PythonResolverContext resolverContext) { IClass resolvedClass = resolverContext.GetClass(typeName); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs index 76a7cdd799..7daa8e531f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs @@ -23,21 +23,15 @@ namespace ICSharpCode.PythonBinding public PythonResolverContext(ParseInformation parseInfo, string fileContent) { this.fileContent = fileContent; - GetCompilationUnits(parseInfo); + GetCompilationUnit(parseInfo); GetProjectContent(); } - void GetCompilationUnits(ParseInformation parseInfo) - { - compilationUnit = GetCompilationUnit(parseInfo); - } - - ICompilationUnit GetCompilationUnit(ParseInformation parseInfo) + void GetCompilationUnit(ParseInformation parseInfo) { if (parseInfo != null) { - return parseInfo.CompilationUnit; + compilationUnit = parseInfo.CompilationUnit; } - return null; } void GetProjectContent() diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs index 04cacf214f..68d24f040d 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs @@ -2,6 +2,7 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; +using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; using PythonBinding.Tests.Utils; using UnitTesting.Tests.Utils; @@ -30,18 +31,81 @@ namespace PythonBinding.Tests.Resolver resolverHelper.ProjectContent.ClassesInProjectContent.Add(testClass); resolverHelper.ProjectContent.SetClassToReturnFromGetClass("Test.Test1", testClass); + } + + [Test] + public void Resolve_LocalVariableIsCreatedOnPreviousLine_ResolveResultVariableNameIsA() + { string python = "a = Test.Test1()\r\n" + "a"; - resolverHelper.Resolve("a", python); + resolverHelper.Resolve("a", python); + + string name = resolverHelper.LocalResolveResult.VariableName; + + Assert.AreEqual("a", name); } - + [Test] - public void ResolveResultVariableName() + public void Resolve_LocalVariableIsCreatedOnPreviousLine_ResolveResultResolvedTypeIsTestClass() { - string name = resolverHelper.LocalResolveResult.VariableName; - Assert.AreEqual("a", name); + string python = + "a = Test.Test1()\r\n" + + "a"; + + resolverHelper.Resolve("a", python); + + IReturnType resolvedType = resolverHelper.LocalResolveResult.ResolvedType; + IClass underlyingClass = resolvedType.GetUnderlyingClass(); + + Assert.AreEqual(testClass, underlyingClass); + } + + [Test] + public void Resolve_LocalVariableIsReDefinedAfterLineBeingConsidered_ResolveResultResolvedTypeIsTestClass() + { + string python = + "a = Test.Test1()\r\n" + + "a\r\n" + + "a = Unknown.Unknown()\r\n"; + + ExpressionResult expression = new ExpressionResult("a"); + expression.Region = new DomRegion( + beginLine: 1, + beginColumn: 0, + endLine: 1, + endColumn: 1); + + resolverHelper.Resolve(expression, python); + + IReturnType resolvedType = resolverHelper.LocalResolveResult.ResolvedType; + IClass underlyingClass = resolvedType.GetUnderlyingClass(); + + Assert.AreEqual(testClass, underlyingClass); + } + + [Test] + public void Resolve_LocalVariableIsReDefinedAfterLineBeingConsideredAndExpressionRegionEndLineIsMinusOne_ResolveResultResolvedTypeIsTestClass() + { + string python = + "a = Test.Test1()\r\n" + + "a\r\n" + + "a = Unknown.Unknown()\r\n"; + + ExpressionResult expression = new ExpressionResult("a"); + expression.Region = new DomRegion( + beginLine: 1, + beginColumn: 0, + endLine: -1, + endColumn: 1); + + resolverHelper.Resolve(expression, python); + + IReturnType resolvedType = resolverHelper.LocalResolveResult.ResolvedType; + IClass underlyingClass = resolvedType.GetUnderlyingClass(); + + Assert.AreEqual(testClass, underlyingClass); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs index dcad496a05..bee429a27f 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs @@ -44,6 +44,11 @@ namespace PythonBinding.Tests.Utils public ResolveResult Resolve(string expression, string code) { ExpressionResult expressionResult = new ExpressionResult(expression); + return Resolve(expressionResult, code); + } + + public ResolveResult Resolve(ExpressionResult expressionResult, string code) + { ResolveResult = Resolver.Resolve(expressionResult, ParseInfo, code); return ResolveResult; } diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj index b37c760e48..32dc5f572e 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -96,6 +96,7 @@ + diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs new file mode 100644 index 0000000000..82422bdfd3 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs @@ -0,0 +1,40 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; + +namespace ICSharpCode.Scripting +{ + /// + /// Used to extract the code for a method based on the range of lines. + /// + public class ScriptingLocalMethod + { + string code = String.Empty; + + public ScriptingLocalMethod(string code) + { + if (code != null) { + this.code = code; + } + } + + public string GetCode(int endLine) + { + int endIndex = FindIndexForEndOfLine(endLine); + if (endIndex > 0) { + return code.Substring(0, endIndex); + } + return code; + } + + int FindIndexForEndOfLine(int line) + { + int index = 0; + for (int i = 0; i <= line; ++i) { + index = code.IndexOf('\n', index) + 1; + } + return index; + } + } +} diff --git a/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj b/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj index ef80e6b8d3..0514adefab 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj +++ b/src/AddIns/BackendBindings/Scripting/Test/ICSharpCode.Scripting.Tests.csproj @@ -62,6 +62,7 @@ + @@ -104,6 +105,7 @@ + diff --git a/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs new file mode 100644 index 0000000000..c20bc2aa39 --- /dev/null +++ b/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs @@ -0,0 +1,91 @@ +// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +using System; +using NUnit.Framework; +using ICSharpCode.Scripting; + +namespace ICSharpCode.Scripting.Tests.Resolver +{ + [TestFixture] + public class ScriptingLocalMethodTests + { + ScriptingLocalMethod method; + + void CreateLocalMethod(string code) + { + method = new ScriptingLocalMethod(code); + } + + [Test] + public void GetCode_EndLineIsZeroAndTwoLinesOfCode_ReturnsFirstLineOfCode() + { + string fullCode = + "first\r\n" + + "second"; + + CreateLocalMethod(fullCode); + + int endLine = 0; + string code = method.GetCode(endLine); + + string expectedCode = "first\r\n"; + + Assert.AreEqual(expectedCode, code); + } + + [Test] + public void GetCode_EndLineIsOneAndThreeLinesOfCode_ReturnsFirstTwoLinesOfCode() + { + string fullCode = + "first\r\n" + + "second\r\n" + + "third"; + + CreateLocalMethod(fullCode); + + int endLine = 1; + string code = method.GetCode(endLine); + + string expectedCode = + "first\r\n" + + "second\r\n"; + + Assert.AreEqual(expectedCode, code); + } + + [Test] + public void GetCode_EndLineIsOneAndTwoLinesOfCode_ReturnsFirstTwoLinesOfCode() + { + string fullCode = + "first\r\n" + + "second"; + + CreateLocalMethod(fullCode); + + int endLine = 1; + string code = method.GetCode(endLine); + + string expectedCode = + "first\r\n" + + "second"; + + Assert.AreEqual(expectedCode, code); + } + + [Test] + public void GetCode_EndLineIsOneAndCodeIsNull_ReturnsEmptyString() + { + string fullCode = null; + + CreateLocalMethod(fullCode); + + int endLine = 1; + string code = method.GetCode(endLine); + + string expectedCode = String.Empty; + + Assert.AreEqual(expectedCode, code); + } + } +} From 9fcf7b169944eecaa13ed30588d1e83624dcf326 Mon Sep 17 00:00:00 2001 From: mrward Date: Sat, 25 Sep 2010 19:47:17 +0100 Subject: [PATCH 23/33] IronPython local variable resolver uses class resolver to find type information. --- .../Src/PythonLocalVariableResolver.cs | 8 +++- .../Project/Src/PythonResolver.cs | 3 +- .../PythonLocalVariableResolverTests.cs | 3 +- .../ResolveLocalClassInstanceTests.cs | 41 +++++++++++++++++-- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs index b6bd9b8a93..173288c3b5 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs @@ -24,11 +24,17 @@ namespace ICSharpCode.PythonBinding /// public class PythonLocalVariableResolver : PythonWalker, IPythonResolver { + PythonClassResolver classResolver; string variableName = String.Empty; string typeName; AssignmentStatement currentAssignStatement; bool foundVariableAssignment; + public PythonLocalVariableResolver(PythonClassResolver classResolver) + { + this.classResolver = classResolver; + } + /// /// The resolved type name. /// @@ -141,7 +147,7 @@ namespace ICSharpCode.PythonBinding LocalResolveResult CreateLocalResolveResult(string typeName, string identifier, PythonResolverContext resolverContext) { - IClass resolvedClass = resolverContext.GetClass(typeName); + IClass resolvedClass = classResolver.GetClass(resolverContext, typeName); if (resolvedClass != null) { return CreateLocalResolveResult(identifier, resolvedClass); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs index daa57b23ce..1f15bc3997 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs @@ -20,7 +20,7 @@ namespace ICSharpCode.PythonBinding PythonSelfResolver selfResolver = new PythonSelfResolver(); PythonMethodResolver methodResolver; PythonMemberResolver memberResolver; - PythonLocalVariableResolver localVariableResolver = new PythonLocalVariableResolver(); + PythonLocalVariableResolver localVariableResolver; List resolvers = new List(); @@ -28,6 +28,7 @@ namespace ICSharpCode.PythonBinding { methodResolver = new PythonMethodResolver(classResolver, standardModuleResolver); memberResolver = new PythonMemberResolver(classResolver); + localVariableResolver = new PythonLocalVariableResolver(classResolver); resolvers.Add(importResolver); resolvers.Add(classResolver); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs index 9977ebf536..24e5d2b6aa 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonLocalVariableResolverTests.cs @@ -16,7 +16,8 @@ namespace PythonBinding.Tests.Resolver void Resolve(string variableName, string code) { - PythonLocalVariableResolver resolver = new PythonLocalVariableResolver(); + PythonClassResolver classResolver = new PythonClassResolver(); + PythonLocalVariableResolver resolver = new PythonLocalVariableResolver(classResolver); typeName = resolver.Resolve(variableName, code); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs index 68d24f040d..4660385048 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs @@ -22,20 +22,25 @@ namespace PythonBinding.Tests.Resolver PythonResolverTestsHelper resolverHelper; MockClass testClass; - [SetUp] - public void Init() + void CreateResolver() { - resolverHelper = new PythonResolverTestsHelper(); + CreateResolver(String.Empty); + } + + void CreateResolver(string code) + { + resolverHelper = new PythonResolverTestsHelper(code); testClass = resolverHelper.CreateClass("Test.Test1"); resolverHelper.ProjectContent.ClassesInProjectContent.Add(testClass); resolverHelper.ProjectContent.SetClassToReturnFromGetClass("Test.Test1", testClass); - } [Test] public void Resolve_LocalVariableIsCreatedOnPreviousLine_ResolveResultVariableNameIsA() { + CreateResolver(); + string python = "a = Test.Test1()\r\n" + "a"; @@ -50,6 +55,8 @@ namespace PythonBinding.Tests.Resolver [Test] public void Resolve_LocalVariableIsCreatedOnPreviousLine_ResolveResultResolvedTypeIsTestClass() { + CreateResolver(); + string python = "a = Test.Test1()\r\n" + "a"; @@ -65,6 +72,8 @@ namespace PythonBinding.Tests.Resolver [Test] public void Resolve_LocalVariableIsReDefinedAfterLineBeingConsidered_ResolveResultResolvedTypeIsTestClass() { + CreateResolver(); + string python = "a = Test.Test1()\r\n" + "a\r\n" + @@ -88,6 +97,8 @@ namespace PythonBinding.Tests.Resolver [Test] public void Resolve_LocalVariableIsReDefinedAfterLineBeingConsideredAndExpressionRegionEndLineIsMinusOne_ResolveResultResolvedTypeIsTestClass() { + CreateResolver(); + string python = "a = Test.Test1()\r\n" + "a\r\n" + @@ -107,5 +118,27 @@ namespace PythonBinding.Tests.Resolver Assert.AreEqual(testClass, underlyingClass); } + + [Test] + public void Resolve_LocalVariableTypeIsImported_ResolveResultResolvedTypeDeterminedFromImportedTypes() + { + string python = + "from MyNamespace import MyClass\r\n" + + "\r\n" + + "a = MyClass()\r\n" + + "a"; + + CreateResolver(python); + + MockClass myClass = resolverHelper.CreateClass("MyNamespace.MyClass"); + resolverHelper.ProjectContent.SetClassToReturnFromGetClass("MyNamespace.MyClass", myClass); + + resolverHelper.Resolve("a", python); + + IReturnType resolvedType = resolverHelper.LocalResolveResult.ResolvedType; + IClass underlyingClass = resolvedType.GetUnderlyingClass(); + + Assert.AreEqual(myClass, underlyingClass); + } } } From 1b445fa6712b13a1be10305db54991ef884064ca Mon Sep 17 00:00:00 2001 From: mrward Date: Sat, 25 Sep 2010 20:35:35 +0100 Subject: [PATCH 24/33] Fix bug in IronPython local variable resolver getting the wrong type due to an off by one problem with line numbers and a problem with name resolution when variable used in several statements. --- .../Src/PythonLocalVariableResolver.cs | 2 + .../ResolveLocalClassInstanceTests.cs | 42 +++++++++++++++++-- .../Project/Src/ScriptingLocalMethod.cs | 5 ++- 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs index 173288c3b5..61991fd996 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs @@ -86,6 +86,8 @@ namespace ICSharpCode.PythonBinding { if (foundVariableAssignment) { typeName = GetTypeName(node.Target); + currentAssignStatement = null; + foundVariableAssignment = false; } return base.Walk(node); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs index 4660385048..45a962856a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveLocalClassInstanceTests.cs @@ -81,9 +81,9 @@ namespace PythonBinding.Tests.Resolver ExpressionResult expression = new ExpressionResult("a"); expression.Region = new DomRegion( - beginLine: 1, + beginLine: 2, beginColumn: 0, - endLine: 1, + endLine: 2, endColumn: 1); resolverHelper.Resolve(expression, python); @@ -106,7 +106,7 @@ namespace PythonBinding.Tests.Resolver ExpressionResult expression = new ExpressionResult("a"); expression.Region = new DomRegion( - beginLine: 1, + beginLine: 2, beginColumn: 0, endLine: -1, endColumn: 1); @@ -140,5 +140,41 @@ namespace PythonBinding.Tests.Resolver Assert.AreEqual(myClass, underlyingClass); } + + [Test] + public void Resolve_LocalVariableMethodIsCalledOnPreviousLine_ResolveResultResolvedTypeIsTestClass() + { + CreateResolver(); + + string python = + "a = Test.Test1()\r\n" + + "a.foo()\r\n" + + "a"; + + resolverHelper.Resolve("a", python); + + IReturnType resolvedType = resolverHelper.LocalResolveResult.ResolvedType; + IClass underlyingClass = resolvedType.GetUnderlyingClass(); + + Assert.AreEqual(testClass, underlyingClass); + } + + [Test] + public void Resolve_LocalVariableMethodIsCalledAfterVariableOnItsOwnOnPreviousLine_ResolveResultResolvedTypeIsTestClass() + { + CreateResolver(); + + string python = + "a = Test.Test1()\r\n" + + "a\r\n" + + "a.foo()\r\n"; + + resolverHelper.Resolve("a", python); + + IReturnType resolvedType = resolverHelper.LocalResolveResult.ResolvedType; + IClass underlyingClass = resolvedType.GetUnderlyingClass(); + + Assert.AreEqual(testClass, underlyingClass); + } } } diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs index 82422bdfd3..3d5b8c3dc6 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingLocalMethod.cs @@ -19,6 +19,9 @@ namespace ICSharpCode.Scripting } } + /// + /// End line is one based. + /// public string GetCode(int endLine) { int endIndex = FindIndexForEndOfLine(endLine); @@ -31,7 +34,7 @@ namespace ICSharpCode.Scripting int FindIndexForEndOfLine(int line) { int index = 0; - for (int i = 0; i <= line; ++i) { + for (int i = 0; i < line; ++i) { index = code.IndexOf('\n', index) + 1; } return index; From 0ee17553118e43900162812a5d7f49ed4906738b Mon Sep 17 00:00:00 2001 From: mrward Date: Sat, 25 Sep 2010 20:53:24 +0100 Subject: [PATCH 25/33] Fix failing unit tests. --- .../Test/Resolver/ScriptingLocalMethodTests.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs b/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs index c20bc2aa39..f97a3efabe 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Resolver/ScriptingLocalMethodTests.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.Scripting.Tests.Resolver } [Test] - public void GetCode_EndLineIsZeroAndTwoLinesOfCode_ReturnsFirstLineOfCode() + public void GetCode_EndLineIsOneAndTwoLinesOfCode_ReturnsFirstLineOfCode() { string fullCode = "first\r\n" + @@ -26,7 +26,7 @@ namespace ICSharpCode.Scripting.Tests.Resolver CreateLocalMethod(fullCode); - int endLine = 0; + int endLine = 1; string code = method.GetCode(endLine); string expectedCode = "first\r\n"; @@ -35,7 +35,7 @@ namespace ICSharpCode.Scripting.Tests.Resolver } [Test] - public void GetCode_EndLineIsOneAndThreeLinesOfCode_ReturnsFirstTwoLinesOfCode() + public void GetCode_EndLineIsTwoAndThreeLinesOfCode_ReturnsFirstTwoLinesOfCode() { string fullCode = "first\r\n" + @@ -44,7 +44,7 @@ namespace ICSharpCode.Scripting.Tests.Resolver CreateLocalMethod(fullCode); - int endLine = 1; + int endLine = 2; string code = method.GetCode(endLine); string expectedCode = @@ -55,7 +55,7 @@ namespace ICSharpCode.Scripting.Tests.Resolver } [Test] - public void GetCode_EndLineIsOneAndTwoLinesOfCode_ReturnsFirstTwoLinesOfCode() + public void GetCode_EndLineIsTwoAndTwoLinesOfCode_ReturnsFirstTwoLinesOfCode() { string fullCode = "first\r\n" + @@ -63,7 +63,7 @@ namespace ICSharpCode.Scripting.Tests.Resolver CreateLocalMethod(fullCode); - int endLine = 1; + int endLine = 2; string code = method.GetCode(endLine); string expectedCode = @@ -74,13 +74,13 @@ namespace ICSharpCode.Scripting.Tests.Resolver } [Test] - public void GetCode_EndLineIsOneAndCodeIsNull_ReturnsEmptyString() + public void GetCode_EndLineIsTwoAndCodeIsNull_ReturnsEmptyString() { string fullCode = null; CreateLocalMethod(fullCode); - int endLine = 1; + int endLine = 2; string code = method.GetCode(endLine); string expectedCode = String.Empty; From 4150e8db5976c8250e47cafcb1e552905ed892bb Mon Sep 17 00:00:00 2001 From: eusebiu Date: Sat, 25 Sep 2010 07:04:47 +0300 Subject: [PATCH 26/33] fix for SD-1713 --- .../AvalonEdit.AddIn/Src/CodeEditorView.cs | 12 +++++++++++- .../CodeCompletion/CompletionWindow.cs | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs index 0bdb97a6c4..c7176ff50d 100755 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs @@ -252,7 +252,17 @@ namespace ICSharpCode.AvalonEdit.AddIn toolTip.Closed += ToolTipClosed; } toolTip.PlacementTarget = this; // required for property inheritance - toolTip.Content = args.ContentToShow; + + if(args.ContentToShow is string) { + toolTip.Content = new TextBlock + { + Text = args.ContentToShow as string, + TextWrapping = TextWrapping.Wrap + }; + } + else + toolTip.Content = args.ContentToShow; + toolTip.IsOpen = true; e.Handled = true; } diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs index a8a73e7b34..b690a99bfd 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs @@ -70,7 +70,15 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion return; object description = item.Description; if (description != null) { - toolTip.Content = description; + if(description is string) { + toolTip.Content = new TextBlock + { + Text = description as string, + TextWrapping = TextWrapping.Wrap + }; + } + else + toolTip.Content = description; toolTip.IsOpen = true; } else { toolTip.IsOpen = false; From f12ade168f5c35bacd8c34e50cb062944358382a Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 26 Sep 2010 16:11:50 +0200 Subject: [PATCH 27/33] UsageDataCollector: collect WPF rendering tier --- .../UsageDataCollector.AddIn/AnalyticsMonitor.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs index 1e31adcbd2..96742aac22 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Threading; - +using System.Windows.Media; using ICSharpCode.Core; using ICSharpCode.Core.Services; using ICSharpCode.SharpDevelop; @@ -121,7 +121,8 @@ namespace ICSharpCode.UsageDataCollector new UsageDataEnvironmentProperty { Name = "culture", Value = CultureInfo.CurrentCulture.Name }, new UsageDataEnvironmentProperty { Name = "userAddInCount", Value = AddInTree.AddIns.Where(a => !a.IsPreinstalled).Count().ToString() }, new UsageDataEnvironmentProperty { Name = "branch", Value = BranchName }, - new UsageDataEnvironmentProperty { Name = "commit", Value = CommitHash } + new UsageDataEnvironmentProperty { Name = "commit", Value = CommitHash }, + new UsageDataEnvironmentProperty { Name = "renderingTier", Value = (RenderCapability.Tier >> 16).ToString() } }; string PROCESSOR_ARCHITECTURE = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"); if (string.IsNullOrEmpty(PROCESSOR_ARCHITECTURE)) { From a767d82ccaef1dd27821602c80aac620559f3e2c Mon Sep 17 00:00:00 2001 From: mrward Date: Sun, 26 Sep 2010 16:28:36 +0100 Subject: [PATCH 28/33] Add support for IronPython code completion on methods after typing 'self'. --- .../Project/Src/PythonSelfResolver.cs | 8 +++ .../Test/Resolver/ResolveSelfTests.cs | 61 +++++++++++++++---- .../Test/Utils/PythonResolverTestsHelper.cs | 5 ++ 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs index 638a2b145f..a02b018bcc 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs @@ -13,6 +13,9 @@ namespace ICSharpCode.PythonBinding if (resolverContext.HasCallingClass) { if (IsSelfExpression(expressionResult)) { return CreateResolveResult(resolverContext); + } else if (IsSelfExpressionAtStart(expressionResult)) { + MemberName memberName = new MemberName(expressionResult.Expression); + return new PythonMethodGroupResolveResult(resolverContext.CallingClass, memberName.Name); } } return null; @@ -29,5 +32,10 @@ namespace ICSharpCode.PythonBinding IReturnType returnType = callingClass.DefaultReturnType; return new ResolveResult(callingClass, null, returnType); } + + bool IsSelfExpressionAtStart(ExpressionResult expressionResult) + { + return expressionResult.Expression.StartsWith("self."); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs index faf47d545f..ec19928927 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/ResolveSelfTests.cs @@ -4,41 +4,80 @@ using System; using ICSharpCode.SharpDevelop.Dom; using NUnit.Framework; +using PythonBinding.Tests.Utils; using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.Resolver { [TestFixture] - public class ResolveSelfTests : ResolveTestsBase + public class ResolveSelfTests { IClass fooClass; + PythonResolverTestsHelper resolverHelper; - protected override ExpressionResult GetExpressionResult() + void CreateResolver(string code) { - fooClass = compilationUnit.Classes[0]; - return new ExpressionResult("self", ExpressionContext.Default); + resolverHelper = new PythonResolverTestsHelper(code); + fooClass = resolverHelper.CompilationUnit.Classes[0]; } - protected override string GetPythonScript() + [Test] + public void Resolve_ExpressionIsSelf_ResolveResultResolvedTypeUnderlyingClassReturnsFooClass() { - return - "class Foo(self)\r\n" + + ResolveSelfExpression(); + IClass underlyingClass = resolverHelper.ResolveResult.ResolvedType.GetUnderlyingClass(); + + Assert.AreEqual(fooClass, underlyingClass); + } + + void ResolveSelfExpression() + { + string code = + "class Foo:\r\n" + " def bar(self):\r\n" + " self\r\n" + "\r\n"; + + CreateResolver(code); + resolverHelper.Resolve("self"); } [Test] - public void Resolve_ExpressionIsSelf_ResolveResultResolvedTypeUnderlyingClassReturnsFooClass() + public void Resolve_ExpressionIsSelf_ResolveResultCallingClassReturnsFooClass() { - IClass underlyingClass = resolveResult.ResolvedType.GetUnderlyingClass(); + ResolveSelfExpression(); + IClass underlyingClass = resolverHelper.ResolveResult.CallingClass; + Assert.AreEqual(fooClass, underlyingClass); } [Test] - public void Resolve_ExpressionIsSelf_ResolveResultCallingClassReturnsFooClass() + public void Resolve_ExpressionIsSelfFollowedByMethodCall_MethodGroupResolveResultNameIsMethodCalled() + { + ResolveSelfMethodExpression(); + string methodName = resolverHelper.MethodGroupResolveResult.Name; + + Assert.AreEqual("bar", methodName); + } + + void ResolveSelfMethodExpression() + { + string code = + "class Foo:\r\n" + + " def bar(self):\r\n" + + " return 0\r\n" + + "\r\n"; + + CreateResolver(code); + resolverHelper.Resolve("self.bar"); + } + + [Test] + public void Resolve_ExpressionIsSelfFollowedByMethodCall_MethodGroupResolveResultContainingTypeUnderlyingClassIsFooClass() { - IClass underlyingClass = resolveResult.CallingClass; + ResolveSelfMethodExpression(); + IClass underlyingClass = resolverHelper.MethodGroupResolveResult.ContainingType.GetUnderlyingClass(); + Assert.AreEqual(fooClass, underlyingClass); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs index bee429a27f..91669aeaf0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs @@ -37,6 +37,7 @@ namespace PythonBinding.Tests.Utils { ExpressionResult expressionResult = new ExpressionResult(expression); PythonResolverContext context = new PythonResolverContext(ParseInfo); + context.GetCallingMember(expressionResult.Region); ResolveResult = Resolver.Resolve(context, expressionResult); return ResolveResult; } @@ -61,6 +62,10 @@ namespace PythonBinding.Tests.Utils get { return ResolveResult as LocalResolveResult; } } + public MethodGroupResolveResult MethodGroupResolveResult { + get { return ResolveResult as MethodGroupResolveResult; } + } + public MockClass CreateClass(string name) { return new MockClass(ProjectContent, name); From 1123bf827822358d5c2b0b73f2a26f13850070ed Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 26 Sep 2010 18:38:27 +0200 Subject: [PATCH 29/33] Allow dragging the CurrentLineBookmark in the IconBarMargin. --- .../AvalonEdit.AddIn/Src/IconBarMargin.cs | 128 +++++++++++++++--- .../Project/Src/Bookmarks/BookmarkBase.cs | 12 ++ .../Src/Bookmarks/ClassMemberBookmark.cs | 26 ++++ .../Project/Src/Bookmarks/IBookmarkMargin.cs | 15 ++ .../Services/Debugger/CurrentLineBookmark.cs | 14 ++ 5 files changed, 178 insertions(+), 17 deletions(-) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs index 6c5f569a01..940db01918 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs @@ -88,32 +88,40 @@ namespace ICSharpCode.AvalonEdit.AddIn IBookmark bm; if (bookmarkDict.TryGetValue(lineNumber, out bm)) { Rect rect = new Rect(0, PixelSnapHelpers.Round(line.VisualTop - textView.VerticalOffset, pixelSize.Height), 16, 16); + if (dragDropBookmark == bm && dragStarted) + drawingContext.PushOpacity(0.5); drawingContext.DrawImage((bm.Image ?? BookmarkBase.DefaultBookmarkImage).ImageSource, rect); + if (dragDropBookmark == bm && dragStarted) + drawingContext.Pop(); } } + if (dragDropBookmark != null && dragStarted) { + Rect rect = new Rect(0, PixelSnapHelpers.Round(dragDropCurrentPoint - 8, pixelSize.Height), 16, 16); + drawingContext.DrawImage((dragDropBookmark.Image ?? BookmarkBase.DefaultBookmarkImage).ImageSource, rect); + } } } + IBookmark dragDropBookmark; // bookmark being dragged (!=null if drag'n'drop is active) + double dragDropStartPoint; + double dragDropCurrentPoint; + bool dragStarted; // whether drag'n'drop operation has started (mouse was moved minimum distance) + protected override void OnMouseDown(MouseButtonEventArgs e) { + CancelDragDrop(); base.OnMouseDown(e); - TextView textView = this.TextView; - if (!e.Handled && textView != null) { - VisualLine visualLine = textView.GetVisualLineFromVisualTop(e.GetPosition(textView).Y + textView.VerticalOffset); - if (visualLine != null) { - int line = visualLine.FirstDocumentLine.LineNumber; - foreach (IBookmark bm in manager.Bookmarks) { - if (bm.LineNumber == line) { - bm.MouseDown(e); - if (e.Handled) - return; - } - } - if (e.ChangedButton == MouseButton.Left) { - // no bookmark on the line: create a new breakpoint - ITextEditor textEditor = textView.Services.GetService(typeof(ITextEditor)) as ITextEditor; - if (textEditor != null) { - ICSharpCode.SharpDevelop.Debugging.DebuggerService.ToggleBreakpointAt(textEditor, line); + int line = GetLineFromMousePosition(e); + if (!e.Handled && line > 0) { + foreach (IBookmark bm in manager.Bookmarks) { + if (bm.LineNumber == line) { + bm.MouseDown(e); + if (e.Handled) + return; + if (e.ChangedButton == MouseButton.Left && bm.CanDragDrop && CaptureMouse()) { + StartDragDrop(bm, e); + e.Handled = true; + return; } } } @@ -122,5 +130,91 @@ namespace ICSharpCode.AvalonEdit.AddIn if (e.ChangedButton == MouseButton.Left) e.Handled = true; } + + protected override void OnLostMouseCapture(MouseEventArgs e) + { + CancelDragDrop(); + base.OnLostMouseCapture(e); + } + + void StartDragDrop(IBookmark bm, MouseEventArgs e) + { + dragDropBookmark = bm; + dragDropStartPoint = dragDropCurrentPoint = e.GetPosition(this).Y; + if (TextView != null) + TextView.PreviewKeyDown += TextView_PreviewKeyDown; + } + + void CancelDragDrop() + { + if (dragDropBookmark != null) { + dragDropBookmark = null; + dragStarted = false; + if (TextView != null) + TextView.PreviewKeyDown -= TextView_PreviewKeyDown; + ReleaseMouseCapture(); + InvalidateVisual(); + } + } + + void TextView_PreviewKeyDown(object sender, KeyEventArgs e) + { + // any key press cancels drag'n'drop + CancelDragDrop(); + if (e.Key == Key.Escape) + e.Handled = true; + } + + int GetLineFromMousePosition(MouseEventArgs e) + { + TextView textView = this.TextView; + if (textView == null) + return 0; + VisualLine vl = textView.GetVisualLineFromVisualTop(e.GetPosition(textView).Y + textView.ScrollOffset.Y); + if (vl == null) + return 0; + return vl.FirstDocumentLine.LineNumber; + } + + protected override void OnMouseMove(MouseEventArgs e) + { + base.OnMouseMove(e); + if (dragDropBookmark != null) { + dragDropCurrentPoint = e.GetPosition(this).Y; + if (Math.Abs(dragDropCurrentPoint - dragDropStartPoint) > SystemParameters.MinimumVerticalDragDistance) + dragStarted = true; + InvalidateVisual(); + } + } + + protected override void OnMouseUp(MouseButtonEventArgs e) + { + base.OnMouseUp(e); + int line = GetLineFromMousePosition(e); + if (!e.Handled && dragDropBookmark != null) { + if (dragStarted) { + if (line != 0) + dragDropBookmark.Drop(line); + e.Handled = true; + } + CancelDragDrop(); + } + if (!e.Handled && line != 0) { + foreach (IBookmark bm in manager.Bookmarks) { + if (bm.LineNumber == line) { + bm.MouseUp(e); + if (e.Handled) + return; + } + } + if (e.ChangedButton == MouseButton.Left && TextView != null) { + // no bookmark on the line: create a new breakpoint + ITextEditor textEditor = TextView.Services.GetService(typeof(ITextEditor)) as ITextEditor; + if (textEditor != null) { + ICSharpCode.SharpDevelop.Debugging.DebuggerService.ToggleBreakpointAt(textEditor, line); + } + } + } + } } } diff --git a/src/Main/Base/Project/Src/Bookmarks/BookmarkBase.cs b/src/Main/Base/Project/Src/Bookmarks/BookmarkBase.cs index 9451b57d52..dfcaf720fc 100644 --- a/src/Main/Base/Project/Src/Bookmarks/BookmarkBase.cs +++ b/src/Main/Base/Project/Src/Bookmarks/BookmarkBase.cs @@ -149,11 +149,23 @@ namespace ICSharpCode.SharpDevelop.Bookmarks } public virtual void MouseDown(MouseButtonEventArgs e) + { + } + + public virtual void MouseUp(MouseButtonEventArgs e) { if (e.ChangedButton == MouseButton.Left && CanToggle) { RemoveMark(); e.Handled = true; } } + + public virtual bool CanDragDrop { + get { return false; } + } + + public virtual void Drop(int lineNumber) + { + } } } diff --git a/src/Main/Base/Project/Src/Bookmarks/ClassMemberBookmark.cs b/src/Main/Base/Project/Src/Bookmarks/ClassMemberBookmark.cs index c960b9f58c..b0e28b445e 100644 --- a/src/Main/Base/Project/Src/Bookmarks/ClassMemberBookmark.cs +++ b/src/Main/Base/Project/Src/Bookmarks/ClassMemberBookmark.cs @@ -49,6 +49,19 @@ namespace ICSharpCode.SharpDevelop.Bookmarks e.Handled = true; } } + + public virtual void MouseUp(MouseButtonEventArgs e) + { + } + + bool IBookmark.CanDragDrop { + get { return false; } + } + + void IBookmark.Drop(int lineNumber) + { + throw new NotSupportedException(); + } } public class ClassBookmark : IBookmark @@ -90,5 +103,18 @@ namespace ICSharpCode.SharpDevelop.Bookmarks e.Handled = true; } } + + public virtual void MouseUp(MouseButtonEventArgs e) + { + } + + bool IBookmark.CanDragDrop { + get { return false; } + } + + void IBookmark.Drop(int lineNumber) + { + throw new NotSupportedException(); + } } } diff --git a/src/Main/Base/Project/Src/Bookmarks/IBookmarkMargin.cs b/src/Main/Base/Project/Src/Bookmarks/IBookmarkMargin.cs index 52afc0fdb9..331d0ce195 100644 --- a/src/Main/Base/Project/Src/Bookmarks/IBookmarkMargin.cs +++ b/src/Main/Base/Project/Src/Bookmarks/IBookmarkMargin.cs @@ -42,5 +42,20 @@ namespace ICSharpCode.SharpDevelop.Bookmarks /// Handles the mouse down event. /// void MouseDown(MouseButtonEventArgs e); + + /// + /// Handles the mouse up event. + /// + void MouseUp(MouseButtonEventArgs e); + + /// + /// Gets whether this bookmark can be dragged around. + /// + bool CanDragDrop { get; } + + /// + /// Notifies the bookmark that it was dropped on the specified line. + /// + void Drop(int lineNumber); } } diff --git a/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs index 1f15ce007b..1bbee51ee2 100644 --- a/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs +++ b/src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs @@ -88,5 +88,19 @@ namespace ICSharpCode.SharpDevelop.Debugging marker.ForegroundColor = Colors.Blue; return marker; } + + public override bool CanDragDrop { + get { return true; } + } + + public override void Drop(int lineNumber) + { + // call async because the Debugger seems to use Application.DoEvents(), but we don't want to process events + // because Drag'N'Drop operation has finished + WorkbenchSingleton.SafeThreadAsyncCall( + delegate { + DebuggerService.CurrentDebugger.SetInstructionPointer(this.FileName, lineNumber, 1); + }); + } } } From 69e65acf48bb83579b835c17d78bfd65e335e400 Mon Sep 17 00:00:00 2001 From: mrward Date: Sun, 26 Sep 2010 17:47:55 +0100 Subject: [PATCH 30/33] Refactor IronPython resolver. --- .../Project/Src/IPythonResolver.cs | 2 +- .../Project/Src/PythonClassResolver.cs | 14 ++-- .../Project/Src/PythonDotNetMethodResolver.cs | 4 +- .../Project/Src/PythonImportResolver.cs | 12 +-- .../Src/PythonLocalVariableResolver.cs | 22 +++--- .../Project/Src/PythonMemberResolver.cs | 9 ++- .../Project/Src/PythonMethodResolver.cs | 6 +- .../Project/Src/PythonNamespaceResolver.cs | 3 +- .../Project/Src/PythonResolver.cs | 10 +-- .../Project/Src/PythonResolverContext.cs | 78 ++++++++++++------- .../Project/Src/PythonSelfResolver.cs | 16 ++-- .../Src/PythonStandardModuleMethodResolver.cs | 4 +- .../Src/PythonStandardModuleResolver.cs | 14 ++-- .../Test/Resolver/PythonSelfResolverTests.cs | 6 +- .../Test/Utils/PythonResolverTestsHelper.cs | 5 +- 15 files changed, 117 insertions(+), 88 deletions(-) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonResolver.cs index c33b49315e..e9e299c053 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IPythonResolver.cs @@ -8,6 +8,6 @@ namespace ICSharpCode.PythonBinding { public interface IPythonResolver { - ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult); + ResolveResult Resolve(PythonResolverContext resolverContext); } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonClassResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonClassResolver.cs index 3c5aa335e8..d1a3427422 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonClassResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonClassResolver.cs @@ -10,19 +10,21 @@ namespace ICSharpCode.PythonBinding { PythonResolverContext resolverContext; - public PythonClassResolver() + public ResolveResult Resolve(PythonResolverContext resolverContext) { - } - - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) - { - IClass matchingClass = GetClass(resolverContext, expressionResult.Expression); + IClass matchingClass = GetClass(resolverContext); if (matchingClass != null) { return CreateTypeResolveResult(matchingClass); } return null; } + public IClass GetClass(PythonResolverContext resolverContext) + { + string name = resolverContext.Expression; + return GetClass(resolverContext, name); + } + public IClass GetClass(PythonResolverContext resolverContext, string name) { this.resolverContext = resolverContext; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDotNetMethodResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDotNetMethodResolver.cs index 2adbbf1907..e225b78d00 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDotNetMethodResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonDotNetMethodResolver.cs @@ -15,9 +15,9 @@ namespace ICSharpCode.PythonBinding this.classResolver = classResolver; } - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { - MemberName memberName = new MemberName(expressionResult.Expression); + MemberName memberName = resolverContext.CreateExpressionMemberName(); IClass matchingClass = classResolver.GetClass(resolverContext, memberName.Type); if (matchingClass != null) { return new PythonMethodGroupResolveResult(matchingClass, memberName.Name); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonImportResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonImportResolver.cs index a1a2c54ea7..7b21192980 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonImportResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonImportResolver.cs @@ -8,15 +8,11 @@ namespace ICSharpCode.PythonBinding { public class PythonImportResolver : IPythonResolver { - public PythonImportResolver() + public ResolveResult Resolve(PythonResolverContext resolverContext) { - } - - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) - { - if (IsNamespace(expressionResult)) { - PythonImportExpression importExpression = new PythonImportExpression(expressionResult.Expression); - PythonImportExpressionContext context = expressionResult.Context as PythonImportExpressionContext; + if (IsNamespace(resolverContext.ExpressionResult)) { + PythonImportExpression importExpression = new PythonImportExpression(resolverContext.Expression); + PythonImportExpressionContext context = resolverContext.ExpressionContext as PythonImportExpressionContext; context.HasFromAndImport = importExpression.HasFromAndImport; return new PythonImportModuleResolveResult(importExpression); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs index 61991fd996..dc94c1c47c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonLocalVariableResolver.cs @@ -123,34 +123,36 @@ namespace ICSharpCode.PythonBinding return PythonControlFieldExpression.GetMemberName(node as MemberExpression); } - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { - return GetLocalVariable(resolverContext, expressionResult); + return GetLocalVariable(resolverContext); } /// /// Tries to find the type that matches the local variable name. /// - LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext, ExpressionResult expressionResult) + LocalResolveResult GetLocalVariable(PythonResolverContext resolverContext) { - string code = GetLocalMethodCode(resolverContext.FileContent, expressionResult); - string typeName = Resolve(expressionResult.Expression, code); + string code = GetLocalMethodCode(resolverContext); + string typeName = Resolve(resolverContext.Expression, code); if (typeName != null) { - return CreateLocalResolveResult(typeName, expressionResult.Expression, resolverContext); + return CreateLocalResolveResult(typeName, resolverContext); } return null; } - string GetLocalMethodCode(string fullCode, ExpressionResult expressionResult) + string GetLocalMethodCode(PythonResolverContext resolverContext) { - ScriptingLocalMethod localMethod = new ScriptingLocalMethod(fullCode); - return localMethod.GetCode(expressionResult.Region.BeginLine); + ScriptingLocalMethod localMethod = new ScriptingLocalMethod(resolverContext.FileContent); + int beginLine = resolverContext.ExpressionRegion.BeginLine; + return localMethod.GetCode(beginLine); } - LocalResolveResult CreateLocalResolveResult(string typeName, string identifier, PythonResolverContext resolverContext) + LocalResolveResult CreateLocalResolveResult(string typeName, PythonResolverContext resolverContext) { IClass resolvedClass = classResolver.GetClass(resolverContext, typeName); if (resolvedClass != null) { + string identifier = resolverContext.Expression; return CreateLocalResolveResult(identifier, resolvedClass); } return null; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs index 3c7b70670e..31dd610fe3 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMemberResolver.cs @@ -19,15 +19,20 @@ namespace ICSharpCode.PythonBinding this.classResolver = classResolver; } - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { - IMember member = FindMember(resolverContext, expressionResult.Expression); + IMember member = FindMember(resolverContext); if (member != null) { return CreateMemberResolveResult(member); } return null; } + IMember FindMember(PythonResolverContext resolverContext) + { + return FindMember(resolverContext, resolverContext.Expression); + } + IMember FindMember(PythonResolverContext resolverContext, string expression) { MemberName memberName = new MemberName(expression); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMethodResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMethodResolver.cs index aeab4d7910..eb552b9cef 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMethodResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonMethodResolver.cs @@ -17,13 +17,13 @@ namespace ICSharpCode.PythonBinding standardModuleMethodResolver = new PythonStandardModuleMethodResolver(standardModuleResolver); } - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { - ResolveResult resolveResult = dotNetMethodResolver.Resolve(resolverContext, expressionResult); + ResolveResult resolveResult = dotNetMethodResolver.Resolve(resolverContext); if (resolveResult != null) { return resolveResult; } - return standardModuleMethodResolver.Resolve(resolverContext, expressionResult); + return standardModuleMethodResolver.Resolve(resolverContext); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonNamespaceResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonNamespaceResolver.cs index 76042b1c41..d5f48f8133 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonNamespaceResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonNamespaceResolver.cs @@ -11,8 +11,9 @@ namespace ICSharpCode.PythonBinding PythonResolverContext resolverContext; ExpressionResult expressionResult; - public PythonNamespaceResolver() + public ResolveResult Resolve(PythonResolverContext resolverContext) { + return Resolve(resolverContext, resolverContext.ExpressionResult); } public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs index 1f15bc3997..18bd70a044 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolver.cs @@ -46,18 +46,18 @@ namespace ICSharpCode.PythonBinding return null; } - resolverContext = new PythonResolverContext(parseInfo, fileContent); - if (!resolverContext.GetCallingMember(expressionResult.Region)) { + resolverContext = new PythonResolverContext(parseInfo, expressionResult, fileContent); + if (!resolverContext.HasProjectContent) { return null; } - return Resolve(resolverContext, expressionResult); + return Resolve(resolverContext); } - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { foreach (IPythonResolver resolver in resolvers) { - ResolveResult resolveResult = resolver.Resolve(resolverContext, expressionResult); + ResolveResult resolveResult = resolver.Resolve(resolverContext); if (resolveResult != null) { return resolveResult; } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs index 7daa8e531f..9b31decf27 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonResolverContext.cs @@ -14,6 +14,7 @@ namespace ICSharpCode.PythonBinding IProjectContent projectContent; IClass callingClass; string fileContent; + ExpressionResult expressionResult; public PythonResolverContext(ParseInformation parseInfo) : this(parseInfo, String.Empty) @@ -21,10 +22,17 @@ namespace ICSharpCode.PythonBinding } public PythonResolverContext(ParseInformation parseInfo, string fileContent) + : this(parseInfo, new ExpressionResult(), fileContent) + { + } + + public PythonResolverContext(ParseInformation parseInfo, ExpressionResult expressionResult, string fileContent) { this.fileContent = fileContent; + this.expressionResult = expressionResult; GetCompilationUnit(parseInfo); GetProjectContent(); + GetCallingMember(); } void GetCompilationUnit(ParseInformation parseInfo) @@ -41,6 +49,27 @@ namespace ICSharpCode.PythonBinding } } + /// + /// Determines the class and member at the specified + /// line and column in the specified file. + /// + void GetCallingMember() + { + if (projectContent != null) { + GetCallingClass(); + } + } + + /// + /// Gets the calling class at the specified line and column. + /// + void GetCallingClass() + { + if (compilationUnit.Classes.Count > 0) { + callingClass = compilationUnit.Classes[0]; + } + } + public string FileContent { get { return fileContent; } } @@ -49,6 +78,27 @@ namespace ICSharpCode.PythonBinding get { return projectContent; } } + public ExpressionResult ExpressionResult { + get { return expressionResult; } + } + + public MemberName CreateExpressionMemberName() + { + return new MemberName(Expression); + } + + public string Expression { + get { return expressionResult.Expression; } + } + + public ExpressionContext ExpressionContext { + get { return expressionResult.Context; } + } + + public DomRegion ExpressionRegion { + get { return expressionResult.Region; } + } + public bool HasProjectContent { get { return projectContent != null; } } @@ -86,34 +136,6 @@ namespace ICSharpCode.PythonBinding return false; } - /// - /// Determines the class and member at the specified - /// line and column in the specified file. - /// - public bool GetCallingMember(DomRegion region) - { - if (compilationUnit == null) { - return false; - } - - if (projectContent != null) { - callingClass = GetCallingClass(region); - return true; - } - return false; - } - - /// - /// Gets the calling class at the specified line and column. - /// - IClass GetCallingClass(DomRegion region) - { - if (compilationUnit.Classes.Count > 0) { - return compilationUnit.Classes[0]; - } - return null; - } - public IClass GetClass(string fullyQualifiedName) { return projectContent.GetClass(fullyQualifiedName, 0); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs index a02b018bcc..ce356dd8da 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonSelfResolver.cs @@ -8,22 +8,22 @@ namespace ICSharpCode.PythonBinding { public class PythonSelfResolver : IPythonResolver { - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { if (resolverContext.HasCallingClass) { - if (IsSelfExpression(expressionResult)) { + if (IsSelfExpression(resolverContext)) { return CreateResolveResult(resolverContext); - } else if (IsSelfExpressionAtStart(expressionResult)) { - MemberName memberName = new MemberName(expressionResult.Expression); + } else if (IsSelfExpressionAtStart(resolverContext)) { + MemberName memberName = resolverContext.CreateExpressionMemberName(); return new PythonMethodGroupResolveResult(resolverContext.CallingClass, memberName.Name); } } return null; } - bool IsSelfExpression(ExpressionResult expressionResult) + bool IsSelfExpression(PythonResolverContext resolverContext) { - return expressionResult.Expression == "self"; + return resolverContext.Expression == "self"; } ResolveResult CreateResolveResult(PythonResolverContext resolverContext) @@ -33,9 +33,9 @@ namespace ICSharpCode.PythonBinding return new ResolveResult(callingClass, null, returnType); } - bool IsSelfExpressionAtStart(ExpressionResult expressionResult) + bool IsSelfExpressionAtStart(PythonResolverContext resolverContext) { - return expressionResult.Expression.StartsWith("self."); + return resolverContext.Expression.StartsWith("self."); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleMethodResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleMethodResolver.cs index 453cdba9dc..86e4d534b0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleMethodResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleMethodResolver.cs @@ -15,9 +15,9 @@ namespace ICSharpCode.PythonBinding this.standardModuleResolver = standardModuleResolver; } - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) + public ResolveResult Resolve(PythonResolverContext resolverContext) { - MemberName memberName = new MemberName(expressionResult.Expression); + MemberName memberName = resolverContext.CreateExpressionMemberName(); MethodGroupResolveResult result = ResolveMethodFromImportedNames(resolverContext, memberName); if (result != null) { return result; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleResolver.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleResolver.cs index a3fcb15e6f..6983a6d1cc 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleResolver.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonStandardModuleResolver.cs @@ -10,19 +10,21 @@ namespace ICSharpCode.PythonBinding { PythonStandardModules standardPythonModules = new PythonStandardModules(); - public PythonStandardModuleResolver() + public ResolveResult Resolve(PythonResolverContext resolverContext) { - } - - public ResolveResult Resolve(PythonResolverContext resolverContext, ExpressionResult expressionResult) - { - PythonStandardModuleType type = GetStandardModuleTypeIfImported(resolverContext, expressionResult.Expression); + PythonStandardModuleType type = GetStandardModuleTypeIfImported(resolverContext); if (type != null) { return new PythonStandardModuleResolveResult(type); } return null; } + PythonStandardModuleType GetStandardModuleTypeIfImported(PythonResolverContext resolverContext) + { + string moduleName = resolverContext.Expression; + return GetStandardModuleTypeIfImported(resolverContext, moduleName); + } + public PythonStandardModuleType GetStandardModuleTypeIfImported(PythonResolverContext resolverContext, string moduleName) { if (resolverContext.HasImport(moduleName) || PythonBuiltInModuleMemberName.IsBuiltInModule(moduleName)) { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonSelfResolverTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonSelfResolverTests.cs index 3c586955de..090b4ddbd8 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonSelfResolverTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Resolver/PythonSelfResolverTests.cs @@ -24,14 +24,13 @@ namespace PythonBinding.Tests.Resolver CreateParseInfo(); CreatePythonResolverContext(); - ResolveResult result = resolver.Resolve(context, expression); + ResolveResult result = resolver.Resolve(context); Assert.IsNull(result); } void CreatePythonSelfResolver() { resolver = new PythonSelfResolver(); - expression = new ExpressionResult("self"); } void CreateParseInfo() @@ -43,7 +42,8 @@ namespace PythonBinding.Tests.Resolver void CreatePythonResolverContext() { - context = new PythonResolverContext(parseInfo); + expression = new ExpressionResult("self"); + context = new PythonResolverContext(parseInfo, expression, String.Empty); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs index 91669aeaf0..6e0eb18fd0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/PythonResolverTestsHelper.cs @@ -36,9 +36,8 @@ namespace PythonBinding.Tests.Utils public ResolveResult Resolve(string expression) { ExpressionResult expressionResult = new ExpressionResult(expression); - PythonResolverContext context = new PythonResolverContext(ParseInfo); - context.GetCallingMember(expressionResult.Region); - ResolveResult = Resolver.Resolve(context, expressionResult); + PythonResolverContext context = new PythonResolverContext(ParseInfo, expressionResult, String.Empty); + ResolveResult = Resolver.Resolve(context); return ResolveResult; } From 4116a1a479970529ec1283c3b102afab53806829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Srbeck=C3=BD?= Date: Sun, 26 Sep 2010 22:55:59 +0100 Subject: [PATCH 31/33] Normalize line ending in debug tests (just in case that the files on disk use linux line endings) --- src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs b/src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs index c6adceb75c..a9f7820e90 100644 --- a/src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs +++ b/src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs @@ -145,6 +145,8 @@ namespace Debugger.Tests string actualXml = new StreamReader(newXmlStream).ReadToEnd() + "\r\n"; string sourceCode = GetResource(testName); + // Normalize the line endings + sourceCode = sourceCode.Replace("\r\n", "\n").Replace("\n", "\r\n"); int startIndex = sourceCode.IndexOf(startMark); int endIndex = sourceCode.IndexOf(endMark); if (startIndex == -1 || endIndex == -1) { From fb51065400a17286a8936fdd8527c96526afe229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Srbeck=C3=BD?= Date: Sun, 26 Sep 2010 22:57:50 +0100 Subject: [PATCH 32/33] Fixed "COM object that has been separated from its underlying RCW cannot be used." in MetaDataImport --- .../Debugger.Core/Interop/MetaDataWrapper.cs | 16 +--------------- src/AddIns/Debugger/Debugger.Core/Module.cs | 2 -- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/AddIns/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs b/src/AddIns/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs index c5c00b0401..2cd57e6ca3 100644 --- a/src/AddIns/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs +++ b/src/AddIns/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs @@ -16,7 +16,7 @@ namespace Debugger.Interop.MetaData { /// Wrapper for the unmanaged metadata API. /// http://msdn.microsoft.com/en-us/library/ms230172.aspx - public class MetaDataImport: IDisposable + public class MetaDataImport { const int DefaultBufferSize = 8; // If buffer is too small, enlarge it @@ -53,20 +53,6 @@ namespace Debugger.Interop.MetaData } } - ~MetaDataImport() - { - Dispose(); - } - - public void Dispose() - { - IMetaDataImport m = this.metaData; - if (m != null) { - Marshal.FinalReleaseComObject(m); - metaData = null; - } - } - // CloseEnum, CountEnum and ResetEnum are not wrapped, use them directly // GetNameFromToken is obsolete diff --git a/src/AddIns/Debugger/Debugger.Core/Module.cs b/src/AddIns/Debugger/Debugger.Core/Module.cs index ce56d5c879..e4decab7c4 100644 --- a/src/AddIns/Debugger/Debugger.Core/Module.cs +++ b/src/AddIns/Debugger/Debugger.Core/Module.cs @@ -307,8 +307,6 @@ namespace Debugger public void Dispose() { UnloadSymbols(); - metaData.Dispose(); - unloaded = true; } From 0d24b46bbea9ec1d9781877d0abe13f5924e1da5 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 26 Sep 2010 18:52:12 +0200 Subject: [PATCH 33/33] IconBarMargin: Fixed cancelling drag'n'drop using Escape. --- .../AvalonEdit.AddIn/Src/IconBarMargin.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs index 940db01918..6be173c17e 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/IconBarMargin.cs @@ -141,8 +141,11 @@ namespace ICSharpCode.AvalonEdit.AddIn { dragDropBookmark = bm; dragDropStartPoint = dragDropCurrentPoint = e.GetPosition(this).Y; - if (TextView != null) - TextView.PreviewKeyDown += TextView_PreviewKeyDown; + if (TextView != null) { + TextArea area = TextView.Services.GetService(typeof(TextArea)) as TextArea; + if (area != null) + area.PreviewKeyDown += TextArea_PreviewKeyDown; + } } void CancelDragDrop() @@ -150,14 +153,17 @@ namespace ICSharpCode.AvalonEdit.AddIn if (dragDropBookmark != null) { dragDropBookmark = null; dragStarted = false; - if (TextView != null) - TextView.PreviewKeyDown -= TextView_PreviewKeyDown; + if (TextView != null) { + TextArea area = TextView.Services.GetService(typeof(TextArea)) as TextArea; + if (area != null) + area.PreviewKeyDown -= TextArea_PreviewKeyDown; + } ReleaseMouseCapture(); InvalidateVisual(); } } - void TextView_PreviewKeyDown(object sender, KeyEventArgs e) + void TextArea_PreviewKeyDown(object sender, KeyEventArgs e) { // any key press cancels drag'n'drop CancelDragDrop();