Browse Source

Merge /branches/3.0 to /trunk.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5692 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 15 years ago
parent
commit
14c53aca0e
  1. 12
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 292
      samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd
  3. 3
      samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd
  4. 13
      samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd
  5. 2
      samples/SharpDevelopReports/src/ReportSamples.sln
  6. 5
      samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs
  7. 94
      samples/SharpDevelopReports/src/SharpReportSamples/EventLogger.cs
  8. 22
      samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs
  9. 204
      samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
  10. BIN
      samples/SharpDevelopReports/src/SharpReportSamples/Resources/Info.png
  11. BIN
      samples/SharpDevelopReports/src/SharpReportSamples/Resources/error.ico
  12. BIN
      samples/SharpDevelopReports/src/SharpReportSamples/Resources/warning.ico
  13. 14
      samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj
  14. 15
      samples/SharpSnippetCompiler/SharpSnippetCompiler.Core/SharpSnippetCompilerControl.cs
  15. 9
      samples/SharpSnippetCompiler/SharpSnippetCompiler.Core/Workbench.cs
  16. 19
      samples/SharpSnippetCompiler/SharpSnippetCompiler/MainForm.cs
  17. 7
      samples/SharpSnippetCompiler/SharpSnippetCompiler/Program.cs
  18. 1
      samples/SharpSnippetCompiler/SharpSnippetCompiler/SharpSnippetCompiler.csproj
  19. 52
      samples/SharpSnippetCompiler/SharpSnippetCompiler/TextEditorDisplayBinding.cs
  20. 3
      src/AddIns/Misc/HtmlHelp2/Project/src/Commands/ShowErrorHelpCommand.cs
  21. 2075
      src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs
  22. 5
      src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG
  23. 1
      src/Libraries/NRefactory/Test/Parser/TypeLevel/MethodDeclarationTests.cs
  24. 4
      src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs
  25. 4
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs
  26. 9
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskView.cs
  27. 5
      src/Main/Base/Project/Src/Services/Tasks/Task.cs
  28. 2
      src/Tools/NUnit/buildnunitconsole.bat
  29. BIN
      src/Tools/NUnit/lib/nunit-console-runner.dll
  30. BIN
      src/Tools/NUnit/lib/nunit-gui-runner.dll
  31. BIN
      src/Tools/NUnit/lib/nunit.core.dll
  32. BIN
      src/Tools/NUnit/lib/nunit.core.interfaces.dll
  33. BIN
      src/Tools/NUnit/lib/nunit.fixtures.dll
  34. BIN
      src/Tools/NUnit/lib/nunit.uiexception.dll
  35. BIN
      src/Tools/NUnit/lib/nunit.uikit.dll
  36. BIN
      src/Tools/NUnit/lib/nunit.util.dll
  37. BIN
      src/Tools/NUnit/nunit-console-dotnet2-x86.exe
  38. 11
      src/Tools/NUnit/nunit-console-dotnet2-x86.exe.config
  39. BIN
      src/Tools/NUnit/nunit-console-dotnet2.exe
  40. 11
      src/Tools/NUnit/nunit-console-dotnet2.exe.config
  41. BIN
      src/Tools/NUnit/nunit-console-x86.exe
  42. 12
      src/Tools/NUnit/nunit-console-x86.exe.config
  43. BIN
      src/Tools/NUnit/nunit-console.exe
  44. 11
      src/Tools/NUnit/nunit-console.exe.config
  45. 8
      src/Tools/NUnit/nunit-console/AssemblyInfo.cs
  46. 5
      src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
  47. BIN
      src/Tools/NUnit/nunit.framework.dll

12
AddIns/ICSharpCode.SharpDevelop.addin

@ -850,13 +850,13 @@ @@ -850,13 +850,13 @@
<ToolbarItem id = "Compile"
icon = "Icons.16x16.BuildCombine"
tooltip = "${res:XML.MainMenu.RunMenu.Compile.Description}"
tooltip = "${res:XML.MainMenu.RunMenu.BuildSolution.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.Build"/>
<ToolbarItem id = "BuildProject"
icon = "Icons.16x16.BuildCurrentSelectedProject"
tooltip = "${res:XML.MainMenu.RunMenu.BuildProject.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"/>
class = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"/>
<ToolbarItem id = "DebuggerSeparator" type = "Separator" />
@ -2074,6 +2074,14 @@ @@ -2074,6 +2074,14 @@
type = "ComboBox"/>
</Path>
<Path name="/SharpDevelop/Pads/TaskList/TaskContextMenu">
<MenuItem id = "Copy"
label = "${res:XML.MainMenu.EditMenu.Copy}"
type = "Item"
icon = "Icons.16x16.CopyIcon"
class = "ICSharpCode.SharpDevelop.Commands.Copy"/>
</Path>
<Path name="/SharpDevelop/Pads/CommonConsole/ToolBar">
<ToolbarItem id = "ClearConsole"
tooltip = "Clear console"

292
samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd

@ -0,0 +1,292 @@ @@ -0,0 +1,292 @@
<?xml version="1.0" encoding="utf-8"?>
<ReportModel>
<ReportSettings>
<ReportSettings>
<DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
<DataModel>PushData</DataModel>
<RightMargin>50</RightMargin>
<UseStandardPrinter>True</UseStandardPrinter>
<SortColumnCollection />
<AvailableFieldsCollection />
<NoDataMessage>No Data for this Report</NoDataMessage>
<LeftMargin>50</LeftMargin>
<PageSize>827, 1169</PageSize>
<Padding>5, 5, 5, 5</Padding>
<BottomMargin>50</BottomMargin>
<CommandType>Text</CommandType>
<ParameterCollection />
<Landscape>False</Landscape>
<ReportName>Customized</ReportName>
<TopMargin>50</TopMargin>
<GroupColumnsCollection />
<GraphicsUnit>Pixel</GraphicsUnit>
<CommandText />
<ReportType>DataReport</ReportType>
<ConnectionString />
</ReportSettings>
</ReportSettings>
<SectionCollection>
<BaseSection>
<Size>727, 91</Size>
<Name>ReportHeader</Name>
<PageBreakAfter>False</PageBreakAfter>
<SectionMargin>0</SectionMargin>
<SectionOffset>0</SectionOffset>
<BackColor>White</BackColor>
<Items>
<BaseImageItem>
<ImageSource>File</ImageSource>
<Location>83, 13</Location>
<Name>BaseImageItem2</Name>
<Size>568, 36</Size>
<ScaleImageToSize>False</ScaleImageToSize>
<BackColor>White</BackColor>
<RelativeFileName>..\Logos\Bannerbeige2.gif</RelativeFileName>
<ImageFileName>D:\SharpDevelop3.0_WorkingCopy\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
</BaseImageItem>
<BaseTextItem>
<BackColor>Silver</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>System - Eventlog</Text>
<Location>83, 55</Location>
<ContentAlignment>TopCenter</ContentAlignment>
<Visible>True</Visible>
<DrawBorder>False</DrawBorder>
<Font>Microsoft Sans Serif, 15pt</Font>
<CanGrow>False</CanGrow>
<FormatString />
<Name>BaseTextItem2147483643</Name>
<FrameColor>White</FrameColor>
<Size>568, 33</Size>
<ForeColor>ControlText</ForeColor>
</BaseTextItem>
</Items>
<Location>50, 50</Location>
<DrawBorder>False</DrawBorder>
</BaseSection>
<BaseSection>
<Size>727, 60</Size>
<Name>ReportPageHeader</Name>
<PageBreakAfter>False</PageBreakAfter>
<SectionMargin>0</SectionMargin>
<SectionOffset>0</SectionOffset>
<BackColor>White</BackColor>
<Items>
<BaseRowItem>
<Location>12, 3</Location>
<AlternateBackColor />
<Name>BaseRowItem2</Name>
<Items>
<BaseTextItem>
<BackColor>White</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>Image</Text>
<Location>20, 7</Location>
<ContentAlignment>TopCenter</ContentAlignment>
<Visible>True</Visible>
<DrawBorder>False</DrawBorder>
<Font>Microsoft Sans Serif, 12pt</Font>
<CanGrow>False</CanGrow>
<FormatString />
<Name>BaseTextItem2147483642</Name>
<FrameColor>White</FrameColor>
<Size>100, 20</Size>
<ForeColor>ControlText</ForeColor>
</BaseTextItem>
<BaseTextItem>
<BackColor>White</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>EntryType</Text>
<Location>135, 7</Location>
<ContentAlignment>TopCenter</ContentAlignment>
<Visible>True</Visible>
<DrawBorder>False</DrawBorder>
<Font>Microsoft Sans Serif, 12pt</Font>
<CanGrow>False</CanGrow>
<FormatString />
<Name>BaseTextItem2147483644</Name>
<FrameColor>White</FrameColor>
<Size>100, 20</Size>
<ForeColor>ControlText</ForeColor>
</BaseTextItem>
<BaseTextItem>
<BackColor>White</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>DateWritten</Text>
<Location>261, 7</Location>
<ContentAlignment>TopCenter</ContentAlignment>
<Visible>True</Visible>
<DrawBorder>False</DrawBorder>
<Font>Microsoft Sans Serif, 12pt</Font>
<CanGrow>False</CanGrow>
<FormatString />
<Name>BaseTextItem2147483645</Name>
<FrameColor>White</FrameColor>
<Size>100, 20</Size>
<ForeColor>ControlText</ForeColor>
</BaseTextItem>
<BaseTextItem>
<BackColor>White</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>Message</Text>
<Location>391, 7</Location>
<ContentAlignment>TopLeft</ContentAlignment>
<Visible>True</Visible>
<DrawBorder>False</DrawBorder>
<Font>Microsoft Sans Serif, 12pt</Font>
<CanGrow>False</CanGrow>
<FormatString />
<Name>BaseTextItem2147483646</Name>
<FrameColor>White</FrameColor>
<Size>248, 20</Size>
<ForeColor>ControlText</ForeColor>
</BaseTextItem>
</Items>
<DrawBorder>False</DrawBorder>
<ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow>
<FrameColor>White</FrameColor>
<Size>697, 44</Size>
<BackColor>White</BackColor>
<Visible>True</Visible>
<ForeColor>Black</ForeColor>
</BaseRowItem>
</Items>
<Location>50, 156</Location>
<DrawBorder>False</DrawBorder>
</BaseSection>
<BaseSection>
<Size>727, 90</Size>
<Name>ReportDetail</Name>
<PageBreakAfter>False</PageBreakAfter>
<SectionMargin>0</SectionMargin>
<SectionOffset>0</SectionOffset>
<BackColor>White</BackColor>
<Items>
<BaseRowItem>
<Location>12, 14</Location>
<AlternateBackColor />
<Name>BaseRowItem1</Name>
<Items>
<BaseImageItem>
<ImageSource>Database</ImageSource>
<Location>20, 7</Location>
<Name>BaseImageItem1</Name>
<Size>30, 30</Size>
<ScaleImageToSize>False</ScaleImageToSize>
<BackColor>White</BackColor>
<ColumnName>Image</ColumnName>
</BaseImageItem>
<BaseDataItem>
<Text>EntryType</Text>
<Font>Microsoft Sans Serif, 8.25pt</Font>
<Location>135, 7</Location>
<CanGrow>False</CanGrow>
<ForeColor>Black</ForeColor>
<StringTrimming>None</StringTrimming>
<ColumnName>EntryType</ColumnName>
<DrawBorder>False</DrawBorder>
<CanShrink>False</CanShrink>
<ContentAlignment>TopLeft</ContentAlignment>
<BackColor>White</BackColor>
<FormatString />
<Name>EntryType</Name>
<Visible>True</Visible>
<Size>100, 20</Size>
<FrameColor>White</FrameColor>
</BaseDataItem>
<BaseDataItem>
<Text>Message</Text>
<Font>Microsoft Sans Serif, 8.25pt</Font>
<Location>391, 7</Location>
<CanGrow>False</CanGrow>
<ForeColor>Black</ForeColor>
<StringTrimming>None</StringTrimming>
<ColumnName>Message</ColumnName>
<DrawBorder>False</DrawBorder>
<CanShrink>False</CanShrink>
<ContentAlignment>TopLeft</ContentAlignment>
<BackColor>White</BackColor>
<FormatString />
<Name>Message</Name>
<Visible>True</Visible>
<Size>248, 20</Size>
<FrameColor>White</FrameColor>
</BaseDataItem>
<BaseDataItem>
<Text>TimeWritten</Text>
<Font>Microsoft Sans Serif, 10pt</Font>
<Location>261, 7</Location>
<CanGrow>False</CanGrow>
<ForeColor>Black</ForeColor>
<StringTrimming>None</StringTrimming>
<ColumnName>TimeWritten</ColumnName>
<DrawBorder>False</DrawBorder>
<CanShrink>False</CanShrink>
<ContentAlignment>TopLeft</ContentAlignment>
<BackColor>White</BackColor>
<FormatString />
<Name>BaseDataItem1</Name>
<Visible>True</Visible>
<Size>100, 20</Size>
<FrameColor>White</FrameColor>
</BaseDataItem>
</Items>
<DrawBorder>False</DrawBorder>
<ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow>
<FrameColor>White</FrameColor>
<Size>697, 63</Size>
<BackColor>White</BackColor>
<Visible>True</Visible>
<ForeColor>Black</ForeColor>
</BaseRowItem>
</Items>
<Location>50, 231</Location>
<DrawBorder>False</DrawBorder>
</BaseSection>
<BaseSection>
<Size>727, 60</Size>
<Name>ReportPageFooter</Name>
<PageBreakAfter>False</PageBreakAfter>
<SectionMargin>0</SectionMargin>
<SectionOffset>0</SectionOffset>
<BackColor>White</BackColor>
<Items>
<BaseTextItem>
<BackColor>White</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>='Page (' + Globals!PageNumber + ') of ( ' + Globals!TotalPages + ' ) Pages'</Text>
<Location>403, 21</Location>
<ContentAlignment>TopLeft</ContentAlignment>
<Visible>True</Visible>
<DrawBorder>False</DrawBorder>
<Font>Microsoft Sans Serif, 8.25pt</Font>
<CanGrow>False</CanGrow>
<FormatString />
<Name>='Page ' + Global!PageNumber + 'of ' + Global!Pages + 'Pages'</Name>
<FrameColor>White</FrameColor>
<Size>166, 20</Size>
<ForeColor>ControlText</ForeColor>
</BaseTextItem>
</Items>
<Location>50, 336</Location>
<DrawBorder>False</DrawBorder>
</BaseSection>
<BaseSection>
<Size>727, 60</Size>
<Name>ReportFooter</Name>
<PageBreakAfter>False</PageBreakAfter>
<SectionMargin>0</SectionMargin>
<SectionOffset>0</SectionOffset>
<BackColor>White</BackColor>
<Items />
<Location>50, 411</Location>
<DrawBorder>False</DrawBorder>
</BaseSection>
</SectionCollection>
</ReportModel>

3
samples/SharpDevelopReports/SampleReports/FormSheet/JCA.srd

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
<ReportSettings>
<DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
<DataModel>FormSheet</DataModel>
<FileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\FormSheet\JCA.srd</FileName>
<RightMargin>50</RightMargin>
<UseStandardPrinter>True</UseStandardPrinter>
<SortColumnCollection />
@ -43,7 +42,7 @@ @@ -43,7 +42,7 @@
<ScaleImageToSize>False</ScaleImageToSize>
<BackColor>Window</BackColor>
<RelativeFileName>..\..\Logos\Bannerbeige2.gif</RelativeFileName>
<ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
<ImageFileName>D:\SharpDevelop3.0_WorkingCopy\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
</BaseImageItem>
</Items>
<Location>50, 50</Location>

13
samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd

@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
<Size>661, 42</Size>
<ScaleImageToSize>False</ScaleImageToSize>
<BackColor>Window</BackColor>
<RelativeFileName>..\Logos\Bannerbeige2.gif</RelativeFileName>
<RelativeFileName>..\..\..\..\..\..\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</RelativeFileName>
<ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
</BaseImageItem>
<BaseLineItem>
@ -133,13 +133,9 @@ @@ -133,13 +133,9 @@
<BackColor>Window</BackColor>
<Items>
<BaseRowItem>
<Location>3, 10</Location>
<AlternateBackColor />
<FrameColor>WindowFrame</FrameColor>
<Name>Row</Name>
<Location>3, 10</Location>
<Visible>True</Visible>
<Size>699, 40</Size>
<Padding>5, 5, 5, 5</Padding>
<Items>
<BaseDataItem>
<DataType>System.String</DataType>
@ -200,9 +196,12 @@ @@ -200,9 +196,12 @@
<FrameColor>WindowFrame</FrameColor>
</BaseDataItem>
</Items>
<DrawBorder>False</DrawBorder>
<ChangeBackColorEveryNRow>0</ChangeBackColorEveryNRow>
<FrameColor>WindowFrame</FrameColor>
<Size>699, 40</Size>
<BackColor>White</BackColor>
<DrawBorder>False</DrawBorder>
<Visible>True</Visible>
<ForeColor>ControlText</ForeColor>
</BaseRowItem>
</Items>

2
samples/SharpDevelopReports/src/ReportSamples.sln

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
# SharpDevelop 3.2.0.5405
# SharpDevelop 3.2.0.5633
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}"
EndProject
Global

5
samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs

@ -17,10 +17,7 @@ namespace SharpReportSamples @@ -17,10 +17,7 @@ namespace SharpReportSamples
/// </summary>
public class ContributorsReportData
{
/*
This list is by no means exhaustive:
Siegfried Pammer
*/
public static ContributorCollection CreateContributorsList () {
ContributorCollection list = new ContributorCollection();

94
samples/SharpDevelopReports/src/SharpReportSamples/EventLogger.cs

@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
/*
* Erstellt mit SharpDevelop.
* Benutzer: Peter Forstmeier
* Datum: 24.03.2010
* Zeit: 19:45
*
* Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
*/
using System;
using System.Collections;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Windows.Forms;
namespace SharpReportSamples
{
/// <summary>
/// Description of EventLogger.
/// </summary>
public class EventLogger
{
ImageList imageList ;
string fileName;
public EventLogger(string fileName)
{
this.fileName = fileName;
this.Run();
}
private void Run() {
EventLog ev = new EventLog();
ev.Log = "System";
ev.MachineName = "."; // Lokale Maschine
FillImageList();
ArrayList ar = new ArrayList();
foreach (System.Diagnostics.EventLogEntry entry in ev.Entries)
{
if (entry.TimeWritten > DateTime.Now.AddDays(-1))
{
ar.Add(entry);
}
}
this.EventLog = ar;
}
// using (var provider = ProfilingDataSQLiteProvider.FromFile("ProfilingSession.sdps"))
// var functions = provider.GetFunctions(0, provider.DataSets.Count - 1);
// foreach (CallTreeNode n in functions) Console.WriteLine("{0}: {1} calls, {2:f2}ms", n.Name, n.CallCount, n.TimeSpent);
private void FillImageList() {
string ns = this.GetType().Namespace;
// System.Console.WriteLine("{0}",ns);
Assembly a = Assembly.GetExecutingAssembly();
string [] resNames = a.GetManifestResourceNames();
// foreach(string s in resNames)
// {
// System.Console.WriteLine("{0}",s);
// }
this.imageList = new ImageList();
Stream imgStream = a.GetManifestResourceStream("SharpReportSamples.Resources.error.ico");
// Stream imgStream = a.GetManifestResourceStream("SharpReportSamples.Resources.Error.png");
this.imageList.Images.Add(Image.FromStream(imgStream));
imgStream = a.GetManifestResourceStream("SharpReportSamples.Resources.Info.png");
this.imageList.Images.Add(Image.FromStream(imgStream));
imgStream = a.GetManifestResourceStream("SharpReportSamples.Resources.warning.ico");
// imgStream = a.GetManifestResourceStream("SharpReportSamples.Resources.Warning.png");
this.imageList.Images.Add(Image.FromStream(imgStream));
// System.Console.WriteLine("imagelist contains {0} images",this.imageList.Images.Count);
}
public ArrayList EventLog {get;set;}
public ImageList Images
{
get {return this.imageList;}
}
}
}

22
samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs generated

@ -40,11 +40,13 @@ namespace SharpReportSamples @@ -40,11 +40,13 @@ namespace SharpReportSamples
System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("PullModel");
System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("PushModel-IList");
System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Provider Independent");
System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Sample Reports", new System.Windows.Forms.TreeNode[] {
System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Customized");
System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("Sample Reports", new System.Windows.Forms.TreeNode[] {
treeNode1,
treeNode2,
treeNode3,
treeNode4});
treeNode4,
treeNode5});
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.treeView1 = new System.Windows.Forms.TreeView();
this.label1 = new System.Windows.Forms.Label();
@ -81,18 +83,20 @@ namespace SharpReportSamples @@ -81,18 +83,20 @@ namespace SharpReportSamples
this.treeView1.Location = new System.Drawing.Point(10, 10);
this.treeView1.Margin = new System.Windows.Forms.Padding(5);
this.treeView1.Name = "treeView1";
treeNode1.Name = "FormSheetItem";
treeNode1.Name = "FormSheetNode";
treeNode1.Text = "FormSheet";
treeNode2.Name = "PullModelItem";
treeNode2.Name = "PullModelNode";
treeNode2.Text = "PullModel";
treeNode3.Name = "iListNode";
treeNode3.Name = "IListNode";
treeNode3.Text = "PushModel-IList";
treeNode4.Name = "Knoten0";
treeNode4.Name = "ProviderIndependedNode";
treeNode4.Text = "Provider Independent";
treeNode5.Name = "Knoten0";
treeNode5.Text = "Sample Reports";
treeNode5.Name = "CustomizedNode";
treeNode5.Text = "Customized";
treeNode6.Name = "Customized";
treeNode6.Text = "Sample Reports";
this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode5});
treeNode6});
this.treeView1.Size = new System.Drawing.Size(148, 444);
this.treeView1.TabIndex = 0;
this.treeView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TreeView1MouseDoubleClick);

204
samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs

@ -15,6 +15,7 @@ using System.IO; @@ -15,6 +15,7 @@ using System.IO;
using System.Windows.Forms;
using ICSharpCode.Reports.Core;
using ICSharpCode.Reports.Core.Exporter.ExportRenderer;
namespace SharpReportSamples
{
@ -28,6 +29,8 @@ namespace SharpReportSamples @@ -28,6 +29,8 @@ namespace SharpReportSamples
private TreeNode pullNode;
private TreeNode iListNode;
private TreeNode providerIndependent;
private TreeNode customized;
private ImageList imageList;
public MainForm()
{
@ -38,14 +41,6 @@ namespace SharpReportSamples @@ -38,14 +41,6 @@ namespace SharpReportSamples
InitTree();
UpdateStatusbar (Application.StartupPath);
this.previewControl1.Messages = new ReportViewerMessagesProvider();
/*
EventLog ev = new EventLog();
ev.Log = "System";
ev.MachineName = "."; // Lokale Maschine
ArrayList ar = new ArrayList();
ar.AddRange(ev.Entries);
*/
}
@ -55,10 +50,9 @@ namespace SharpReportSamples @@ -55,10 +50,9 @@ namespace SharpReportSamples
string startupPath = Application.StartupPath;
string samplesDir = @"SharpDevelopReports\";
int y = startupPath.IndexOf(samplesDir);
string startPath = startupPath.Substring(0,y + samplesDir.Length) + @"SampleReports\";
int i = startupPath.IndexOf(samplesDir);
string startPath = startupPath.Substring(0,i + samplesDir.Length) + @"SampleReports\";
//D:\Reporting3.0_branches\SharpDevelop\samples\SharpDevelopReports\SampleReports
string pathToFormSheet = startPath + formSheetDir;
@ -66,14 +60,16 @@ namespace SharpReportSamples @@ -66,14 +60,16 @@ namespace SharpReportSamples
this.pullNode = this.treeView1.Nodes[0].Nodes[1];
this.iListNode = this.treeView1.Nodes[0].Nodes[2];
this.providerIndependent = this.treeView1.Nodes[0].Nodes[3];
this.customized = this.treeView1.Nodes[0].Nodes[4];
AddNodesToTree (this.formNode,startPath + @"FormSheet\" );
AddNodesToTree (this.pullNode,startPath + @"PullModel\" );
AddNodesToTree (this.iListNode,startPath + @"IList\" );
AddNodesToTree (this.providerIndependent,startPath + @"ProviderIndependent\" );
AddNodesToTree (this.customized,startPath + @"Customized\" );
}
private void AddNodesToTree (TreeNode parent,string path)
{
if (!Directory.Exists(path)) {
@ -104,7 +100,9 @@ namespace SharpReportSamples @@ -104,7 +100,9 @@ namespace SharpReportSamples
this.RunContributors(reportName);
} else if (s == "NoConnectionReport") {
this.RunProviderIndependent(reportName);
}
} else if (s =="EventLog")
this.RunEventLogger(reportName);
// this.RunEventLogger_Pdf(reportName);
else {
ReportParameters parameters = ReportEngine.LoadParameters(reportName);
@ -171,44 +169,157 @@ namespace SharpReportSamples @@ -171,44 +169,157 @@ namespace SharpReportSamples
{
this.previewControl1.RunReport(model,dataManager);
};
this.previewControl1.RunReport(model,dataManager);
}
//Try this to react to SectionrenderEvent,
/*
private void PushPrinting (object sender,SectionRenderEventArgs e)
private void RunEventLogger_Pdf (string fileName)
{
Cursor.Current = Cursors.WaitCursor;
EventLogger eventLogger = new EventLogger(fileName);
Cursor.Current = Cursors.Default;
switch (e.CurrentSection) {
case GlobalEnums.ReportSection.ReportHeader:
break;
this.imageList = eventLogger.Images;
ReportModel model = ReportEngine.LoadReportModel(fileName);
IReportCreator creator = ReportEngine.CreatePageBuilder(model,eventLogger.EventLog,null);
creator.SectionRendering += PushPrinting;
creator.BuildExportList();
using (PdfRenderer pdfRenderer = PdfRenderer.CreateInstance(creator,SelectFilename(),true))
{
pdfRenderer.Start();
pdfRenderer.RenderOutput();
pdfRenderer.End();
}
}
private void RunEventLogger (string fileName)
{
/*
using (var provider = ProfilingDataSQLiteProvider.FromFile("ProfilingSession.sdps")){
var functions = provider.GetFunctions(0, provider.DataSets.Count - 1);
foreach (CallTreeNode n in functions) {
Console.WriteLine("{0}: {1} calls, {2:f2}ms", n.Name, n.CallCount, n.TimeSpent);
}
}
*/
Cursor.Current = Cursors.WaitCursor;
EventLogger eLog = new EventLogger(fileName);
Cursor.Current = Cursors.Default;
case GlobalEnums.ReportSection.ReportPageHeader:
break;
case GlobalEnums.ReportSection.ReportDetail:
BaseRowItem ri = e.Section.Items[0] as BaseRowItem;
if (ri != null) {
BaseDataItem r = (BaseDataItem)ri.Items.Find("unbound3");
if (r != null) {
r.DBValue = "xxxxxxx";
}
}
this.imageList = eLog.Images;
ReportModel model = ReportEngine.LoadReportModel(fileName);
IDataManager dataManager = DataManager.CreateInstance(eLog.EventLog,model.ReportSettings);
this.previewControl1.SectionRendering += PushPrinting;
this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
{
this.previewControl1.RunReport(model,dataManager);
};
this.previewControl1.RunReport(model,dataManager);
}
//Handles SectionRenderEvent
int hour = 0;
private void PushPrinting (object sender, SectionRenderEventArgs e )
{
string sectionName = e.Section.Name;
if (sectionName == ReportSectionNames.ReportHeader) {
Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportHeader);
}
else if (sectionName == ReportSectionNames.ReportPageHeader) {
Console.WriteLine("PushPrinting :" +ReportSectionNames .ReportPageHeader);
}
else if (sectionName == ReportSectionNames.ReportDetail){
Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportDetail);
// TimeWritten
BaseDataItem time = e.Section.FindItem("BaseDataItem1") as BaseDataItem;
if (time != null) {
DateTime dateTime = Convert.ToDateTime(time.DBValue);
break;
case GlobalEnums.ReportSection.ReportPageFooter:
break;
int newhour = dateTime.Hour;
if (hour != newhour) {
hour = newhour;
e.Section.Items[0].DrawBorder = true;
e.Section.Items[0].FrameColor = Color.Black;
// e.Section.Items[0].BackColor = Color.LightGray;
time.DBValue = dateTime.Hour.ToString();
time.ContentAlignment = ContentAlignment.MiddleLeft;
case GlobalEnums.ReportSection.ReportFooter:
break;
} else {
time.DrawBorder = false;
e.Section.Items[0].FrameColor = Color.White;
// e.Section.Items[0].BackColor = Color.White;
time.DBValue = dateTime.Minute.ToString() + ":" + dateTime.Second.ToString();
time.ContentAlignment = ContentAlignment.MiddleRight;
}
}
// D:\SharpDevelop3.0_WorkingCopy\SharpDevelop\samples\SharpDevelopReports\SampleReports\EventLogger\Error.png
// Image
BaseDataItem dataItem = e.Section.FindItem("EntryType") as BaseDataItem;
if (dataItem != null) {
string str = dataItem.DBValue;
Image image = null;
if (str == "Information") {
image = this.imageList.Images[1];
} else if (str == "Warning") {
image = this.imageList.Images[2];
} else if (str == "Error")
{
image = this.imageList.Images[0];
}
default:
break;
if (image != null)
{
BaseImageItem imageItem = e.Section.FindItem("BaseImageItem1") as BaseImageItem;
if (imageItem != null) {
imageItem.Image = image;
}
}
}
}
else if (sectionName == ReportSectionNames.ReportPageFooter){
Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportPageFooter);
}
else if (sectionName == ReportSectionNames.ReportFooter){
Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportFooter);
}
else{
throw new WrongSectionException(sectionName);
}
}
*/
private string SelectFilename()
{
using (SaveFileDialog saveDialog = new SaveFileDialog()){
saveDialog.FileName = "_pdf";
saveDialog.DefaultExt = "PDF";
saveDialog.ValidateNames = true;
if(saveDialog.ShowDialog() == DialogResult.OK){
return saveDialog.FileName;
} else {
return String.Empty;
}
}
}
#endregion
@ -246,21 +357,6 @@ namespace SharpReportSamples @@ -246,21 +357,6 @@ namespace SharpReportSamples
}
}
private string SelectFilename()
{
using (SaveFileDialog saveDialog = new SaveFileDialog()){
saveDialog.FileName = "_pdf";
saveDialog.DefaultExt = "PDF";
saveDialog.ValidateNames = true;
if(saveDialog.ShowDialog() == DialogResult.OK){
return saveDialog.FileName;
} else {
return String.Empty;
}
}
}
*/
}
}

BIN
samples/SharpDevelopReports/src/SharpReportSamples/Resources/Info.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
samples/SharpDevelopReports/src/SharpReportSamples/Resources/error.ico

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
samples/SharpDevelopReports/src/SharpReportSamples/Resources/warning.ico

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

14
samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj

@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
@ -51,6 +52,7 @@ @@ -51,6 +52,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ContributorsList.cs" />
<Compile Include="EventLogger.cs" />
<Compile Include="MainForm.cs" />
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
@ -61,15 +63,9 @@ @@ -61,15 +63,9 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="..\..\SampleReports\EventLogger\Error.png">
<Link>Resources\Error.png</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\SampleReports\EventLogger\Info.png">
<Link>Resources\Info.png</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\..\SampleReports\EventLogger\Warning.png">
<Link>Resources\Warning.png</Link>
</EmbeddedResource>
<EmbeddedResource Include="Resources\error.ico" />
<EmbeddedResource Include="Resources\Info.png" />
<EmbeddedResource Include="Resources\warning.ico" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources" />

15
samples/SharpSnippetCompiler/SharpSnippetCompiler.Core/SharpSnippetCompilerControl.cs

@ -32,8 +32,6 @@ namespace ICSharpCode.SharpSnippetCompiler.Core @@ -32,8 +32,6 @@ namespace ICSharpCode.SharpSnippetCompiler.Core
textEditor = new SharpDevelopTextAreaControl();
textEditor.Dock = DockStyle.Fill;
this.Controls.Add(textEditor);
textEditor.ActiveTextAreaControl.TextArea.IconBarMargin.MouseDown += MarginMouseDown;
}
public TextEditorControl TextEditor {
@ -49,18 +47,5 @@ namespace ICSharpCode.SharpSnippetCompiler.Core @@ -49,18 +47,5 @@ namespace ICSharpCode.SharpSnippetCompiler.Core
{
textEditor.SaveFile(textEditor.FileName);
}
static void MarginMouseDown(AbstractMargin iconBar, Point mousepos, MouseButtons mouseButtons)
{
if (mouseButtons != MouseButtons.Left) return;
Rectangle viewRect = iconBar.TextArea.TextView.DrawingPosition;
TextLocation logicPos = iconBar.TextArea.TextView.GetLogicalPosition(0, mousepos.Y - viewRect.Top);
if (logicPos.Y >= 0 && logicPos.Y < iconBar.TextArea.Document.TotalNumberOfLines) {
DebuggerService.ToggleBreakpointAt(iconBar.TextArea.Document, iconBar.TextArea.MotherTextEditorControl.FileName, logicPos.Y);
iconBar.TextArea.Refresh(iconBar);
}
}
}
}

9
samples/SharpSnippetCompiler/SharpSnippetCompiler.Core/Workbench.cs

@ -91,7 +91,8 @@ namespace ICSharpCode.SharpSnippetCompiler.Core @@ -91,7 +91,8 @@ namespace ICSharpCode.SharpSnippetCompiler.Core
public void ShowView(IViewContent content)
{
throw new NotImplementedException();
views.Add(content);
OnViewOpened(new ViewContentEventArgs(content));
}
public void ShowPad(PadDescriptor content)
@ -121,7 +122,11 @@ namespace ICSharpCode.SharpSnippetCompiler.Core @@ -121,7 +122,11 @@ namespace ICSharpCode.SharpSnippetCompiler.Core
public void CloseContent(IViewContent content)
{
throw new NotImplementedException();
if (views.Contains(content)) {
views.Remove(content);
}
content.Dispose();
}
public void CloseAllViews()

19
samples/SharpSnippetCompiler/SharpSnippetCompiler/MainForm.cs

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
// SharpDevelop samples
// Copyright (c) 2008, AlphaSierraPapa
// Copyright (c) 2010, AlphaSierraPapa
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
@ -31,6 +31,8 @@ using System.Collections.Generic; @@ -31,6 +31,8 @@ using System.Collections.Generic;
using System.IO;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Commands;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
@ -91,7 +93,7 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -91,7 +93,7 @@ namespace ICSharpCode.SharpSnippetCompiler
get { return fileTabControl.SelectedTab as SnippetTabPage; }
}
public void LoadFile(string fileName)
public IViewContent LoadFile(string fileName)
{
// Create a new tab page.
SharpSnippetCompilerControl snippetControl = new SharpSnippetCompilerControl();
@ -107,9 +109,11 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -107,9 +109,11 @@ namespace ICSharpCode.SharpSnippetCompiler
WorkbenchWindow window = new WorkbenchWindow(fileTabControl, tabPage);
MainViewContent view = new MainViewContent(fileName, snippetControl, window);
WorkbenchSingleton.Workbench.ViewContentCollection.Add(view);
WorkbenchSingleton.Workbench.ShowView(view);
UpdateActiveView(view);
return view;
}
public void ActivateErrorList()
@ -357,7 +361,14 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -357,7 +361,14 @@ namespace ICSharpCode.SharpSnippetCompiler
if (item != null) {
ProjectService.RemoveProjectItem(project, item);
project.Save();
foreach (IViewContent view in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (view.Control == snippetControl) {
WorkbenchSingleton.Workbench.CloseContent(view);
break;
}
}
fileTabControl.TabPages.Remove(activeTabPage);
activeTabPage.Dispose();
}

7
samples/SharpSnippetCompiler/SharpSnippetCompiler/Program.cs

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
// SharpDevelop samples
// Copyright (c) 2008, AlphaSierraPapa
// Copyright (c) 2010, AlphaSierraPapa
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
@ -32,6 +32,7 @@ using System.Windows.Forms; @@ -32,6 +32,7 @@ using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpSnippetCompiler.Core;
@ -54,6 +55,10 @@ namespace ICSharpCode.SharpSnippetCompiler @@ -54,6 +55,10 @@ namespace ICSharpCode.SharpSnippetCompiler
SharpSnippetCompilerManager.Init();
mainForm = new MainForm();
// Force creation of the debugger before workbench is created.
IDebugger debugger = DebuggerService.CurrentDebugger;
Workbench workbench = new Workbench(mainForm);
WorkbenchSingleton.InitializeWorkbench(workbench, new WorkbenchLayout());
PadDescriptor errorList = workbench.GetPad(typeof(ErrorListPad));

1
samples/SharpSnippetCompiler/SharpSnippetCompiler/SharpSnippetCompiler.csproj

@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="SnippetTabPage.cs" />
<Compile Include="TextEditorDisplayBinding.cs" />
<Compile Include="WorkbenchLayout.cs" />
<Compile Include="WorkbenchWindow.cs" />
<EmbeddedResource Include="MainForm.resx">

52
samples/SharpSnippetCompiler/SharpSnippetCompiler/TextEditorDisplayBinding.cs

@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
// SharpDevelop samples
// Copyright (c) 2010, AlphaSierraPapa
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
// - Redistributions of source code must retain the above copyright notice, this list
// of conditions and the following disclaimer.
//
// - Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other materials
// provided with the distribution.
//
// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to
// endorse or promote products derived from this software without specific prior written
// permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpSnippetCompiler.Core;
namespace ICSharpCode.SharpSnippetCompiler
{
public class TextEditorDisplayBinding : IDisplayBinding
{
public TextEditorDisplayBinding()
{
}
public bool CanCreateContentForFile(string fileName)
{
return true;
}
public IViewContent CreateContentForFile(OpenedFile file)
{
MainForm form = WorkbenchSingleton.MainForm as MainForm;
return form.LoadFile(file.FileName);
}
}
}

3
src/AddIns/Misc/HtmlHelp2/Project/src/Commands/ShowErrorHelpCommand.cs

@ -29,6 +29,9 @@ namespace HtmlHelp2.Commands @@ -29,6 +29,9 @@ namespace HtmlHelp2.Commands
// Search all selected tasks
foreach (Task t in new List<Task>(view.SelectedTasks)) {
if (t.BuildError == null)
continue;
string code = t.BuildError.ErrorCode;
if (string.IsNullOrEmpty(code))

2075
src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs

File diff suppressed because it is too large Load Diff

5
src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG

@ -903,6 +903,7 @@ StructureMemberDecl<ModifierList m, List<AttributeSection> attributes> @@ -903,6 +903,7 @@ StructureMemberDecl<ModifierList m, List<AttributeSection> attributes>
HandlesClause<out handlesClause>
)
]
(. Location endLocation = t.EndLocation; .)
(
/* abstract methods without a body */
IF(IsMustOverride(m))
@ -912,7 +913,7 @@ StructureMemberDecl<ModifierList m, List<AttributeSection> attributes> @@ -912,7 +913,7 @@ StructureMemberDecl<ModifierList m, List<AttributeSection> attributes>
Name = name, Modifier = m.Modifier, TypeReference = type,
Parameters = p, Attributes = attributes,
StartLocation = m.GetDeclarationLocation(startPos),
EndLocation = t.EndLocation,
EndLocation = endLocation,
HandlesClause = handlesClause,
Templates = templates,
InterfaceImplementations = implementsClause
@ -930,7 +931,7 @@ StructureMemberDecl<ModifierList m, List<AttributeSection> attributes> @@ -930,7 +931,7 @@ StructureMemberDecl<ModifierList m, List<AttributeSection> attributes>
Name = name, Modifier = m.Modifier, TypeReference = type,
Parameters = p, Attributes = attributes,
StartLocation = m.GetDeclarationLocation(startPos),
EndLocation = t.EndLocation,
EndLocation = endLocation,
Templates = templates,
HandlesClause = handlesClause,
InterfaceImplementations = implementsClause

1
src/Libraries/NRefactory/Test/Parser/TypeLevel/MethodDeclarationTests.cs

@ -331,7 +331,6 @@ namespace ICSharpCode.NRefactory.Tests.Ast @@ -331,7 +331,6 @@ namespace ICSharpCode.NRefactory.Tests.Ast
}
[Test]
[Ignore("End line for function is off by one.")]
public void VBNetFunctionMethodDeclarationTest()
{
const string program = @"public function MyFunction() as Integer

4
src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs

@ -15,6 +15,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -15,6 +15,8 @@ namespace ICSharpCode.SharpDevelop.Gui
{
public class ErrorListPad : AbstractPadContent, IClipboardHandler
{
public const string DefaultContextMenuAddInTreeEntry = "/SharpDevelop/Pads/ErrorList/TaskContextMenu";
static ErrorListPad instance;
public static ErrorListPad Instance {
get {
@ -24,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -24,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Gui
ToolStrip toolStrip;
Panel contentPanel = new Panel();
TaskView taskView = new TaskView();
TaskView taskView = new TaskView() { DefaultContextMenuAddInTreeEntry = ErrorListPad.DefaultContextMenuAddInTreeEntry };
Properties properties;

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

@ -20,6 +20,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -20,6 +20,8 @@ namespace ICSharpCode.SharpDevelop.Gui
{
public class TaskListPad : AbstractPadContent, IClipboardHandler
{
public const string DefaultContextMenuAddInTreeEntry = "/SharpDevelop/Pads/TaskList/TaskContextMenu";
static TaskListPad instance;
Dictionary<string, bool> displayedTokens;
IClass oldClass;
@ -33,7 +35,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -33,7 +35,7 @@ namespace ICSharpCode.SharpDevelop.Gui
ToolStrip toolStrip;
Panel contentPanel = new Panel();
TaskView taskView = new TaskView();
TaskView taskView = new TaskView() { DefaultContextMenuAddInTreeEntry = TaskListPad.DefaultContextMenuAddInTreeEntry };
public Dictionary<string, bool> DisplayedTokens {
get { return displayedTokens; }

9
src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskView.cs

@ -41,6 +41,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -41,6 +41,8 @@ namespace ICSharpCode.SharpDevelop.Gui
ColumnHeader path = new ColumnHeader();
ToolTip taskToolTip = new ToolTip();
public string DefaultContextMenuAddInTreeEntry { get; set; }
public Task SelectedTask {
get {
if (this.FocusedItem==null) {
@ -243,11 +245,14 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -243,11 +245,14 @@ namespace ICSharpCode.SharpDevelop.Gui
for (int i = 1; i < this.SelectedItems.Count; i++) {
string entry2 = ((Task)this.SelectedItems[i].Tag).ContextMenuAddInTreeEntry;
if (entry2 != entry) {
entry = Task.DefaultContextMenuAddInTreeEntry;
entry = null;
break;
}
}
MenuService.ShowContextMenu(this, entry, this, pos.X, pos.Y);
if (entry == null)
entry = DefaultContextMenuAddInTreeEntry;
if (entry != null)
MenuService.ShowContextMenu(this, entry, this, pos.X, pos.Y);
}
}
base.WndProc(ref m);

5
src/Main/Base/Project/Src/Services/Tasks/Task.cs

@ -22,13 +22,14 @@ namespace ICSharpCode.SharpDevelop @@ -22,13 +22,14 @@ namespace ICSharpCode.SharpDevelop
public class Task
{
public const string DefaultContextMenuAddInTreeEntry = "/SharpDevelop/Pads/ErrorList/TaskContextMenu";
[Obsolete("Default path now depends on parent pad, use ErrorListPad.DefaultContextMenuAddInTreeEntry instead.")]
public const string DefaultContextMenuAddInTreeEntry = Gui.ErrorListPad.DefaultContextMenuAddInTreeEntry;
string description;
TaskType type;
PermanentAnchor position;
bool hasLocation;
string contextMenuAddInTreeEntry = DefaultContextMenuAddInTreeEntry;
string contextMenuAddInTreeEntry;
object tag;
public override string ToString()

2
src/Tools/NUnit/buildnunitconsole.bat

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
%windir%\microsoft.net\framework\v3.5\msbuild /property:Configuration=Release nunit-console\nunit-console.sln
copy nunit-console.exe nunit-console-x86.exe
"%programfiles%\Microsoft.net\sdk\v2.0\bin\corflags" /32bit+ nunit-console-x86.exe
corflags /32bit+ nunit-console-x86.exe
@IF %ERRORLEVEL% NEQ 0 GOTO err
copy nunit-console.exe nunit-console-dotnet2.exe
copy nunit-console-x86.exe nunit-console-dotnet2-x86.exe

BIN
src/Tools/NUnit/lib/nunit-console-runner.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit-gui-runner.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit.core.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit.core.interfaces.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit.fixtures.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit.uiexception.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit.uikit.dll

Binary file not shown.

BIN
src/Tools/NUnit/lib/nunit.util.dll

Binary file not shown.

BIN
src/Tools/NUnit/nunit-console-dotnet2-x86.exe

Binary file not shown.

11
src/Tools/NUnit/nunit-console-dotnet2-x86.exe.config

@ -1,16 +1,5 @@ @@ -1,16 +1,5 @@
<?xml version="1.0"?>
<configuration>
<!--
Application settings for NUnit-console.exe. Do NOT put settings
for use by your tests here.
-->
<appSettings>
<!--
Specify the location to be used by .NET for the cache
-->
<add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
</appSettings>
<!-- Set the level for tracing NUnit itself -->
<!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
<system.diagnostics>

BIN
src/Tools/NUnit/nunit-console-dotnet2.exe

Binary file not shown.

11
src/Tools/NUnit/nunit-console-dotnet2.exe.config

@ -1,16 +1,5 @@ @@ -1,16 +1,5 @@
<?xml version="1.0"?>
<configuration>
<!--
Application settings for NUnit-console.exe. Do NOT put settings
for use by your tests here.
-->
<appSettings>
<!--
Specify the location to be used by .NET for the cache
-->
<add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
</appSettings>
<!-- Set the level for tracing NUnit itself -->
<!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
<system.diagnostics>

BIN
src/Tools/NUnit/nunit-console-x86.exe

Binary file not shown.

12
src/Tools/NUnit/nunit-console-x86.exe.config

@ -3,18 +3,6 @@ @@ -3,18 +3,6 @@
<startup>
<requiredRuntime version="v4.0" />
</startup>
<!--
Application settings for NUnit-console.exe. Do NOT put settings
for use by your tests here.
-->
<appSettings>
<!--
Specify the location to be used by .NET for the cache
-->
<add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
</appSettings>
<!-- Set the level for tracing NUnit itself -->
<!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->
<system.diagnostics>

BIN
src/Tools/NUnit/nunit-console.exe

Binary file not shown.

11
src/Tools/NUnit/nunit-console.exe.config

@ -3,17 +3,6 @@ @@ -3,17 +3,6 @@
<startup>
<requiredRuntime version="v4.0" />
</startup>
<!--
Application settings for NUnit-console.exe. Do NOT put settings
for use by your tests here.
-->
<appSettings>
<!--
Specify the location to be used by .NET for the cache
-->
<add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
</appSettings>
<!-- Set the level for tracing NUnit itself -->
<!-- 0=Off 1=Error 2=Warning 3=Info 4=Debug -->

8
src/Tools/NUnit/nunit-console/AssemblyInfo.cs

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
// ****************************************************************
// This is free software licensed under the NUnit license. You
// may obtain a copy of the license as well as information regarding
// copyright ownership at http://nunit.org/?p=license&r=2.4.
//
// copyright ownership at http://nunit.org.
// ****************************************************************
using System.Reflection;
@ -36,5 +36,5 @@ using System.Reflection; @@ -36,5 +36,5 @@ using System.Reflection;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.3")]
[assembly: AssemblyInformationalVersion("2.5.3")]
[assembly: AssemblyVersion("2.5.4")]
[assembly: AssemblyInformationalVersion("2.5.4")]

5
src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs

@ -76,7 +76,7 @@ namespace NUnit.ConsoleRunner @@ -76,7 +76,7 @@ namespace NUnit.ConsoleRunner
? package.Settings["RuntimeFramework"]
: "Default");
TestRunner testRunner = TestRunnerFactory.MakeTestRunner(package);
TestRunner testRunner = new TestRunnerFactory().MakeTestRunner(package);
testRunner.Load(package);
try
@ -224,7 +224,8 @@ namespace NUnit.ConsoleRunner @@ -224,7 +224,8 @@ namespace NUnit.ConsoleRunner
}
else
{
package = new TestPackage(null, options.Parameters);
// TODO: Figure out a better way to handle "anonymous" packages
package = new TestPackage((string)options.Parameters[0], options.Parameters);
domainUsage = DomainUsage.Multiple;
}

BIN
src/Tools/NUnit/nunit.framework.dll

Binary file not shown.
Loading…
Cancel
Save