pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add back old SDR implementation

pull/45/merge
Siegfried Pammer 12 years ago
parent
68ae72226d
commit
d2a62c1940
5 changed files with 71 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      SharpDevelop.Tests.sln
  2. 32
      SharpDevelop.sln
  3. 6
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj
  4. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs
  5. 23
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/FormattingFixture.cs

38
SharpDevelop.Tests.sln
Unescape View File

@ -135,6 +135,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2", "src\AddIns @@ -135,6 +135,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2", "src\AddIns
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2.Tests", "src\AddIns\Misc\AddInManager2\AddInManager2.Tests\AddInManager2.Tests.csproj", "{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{FEDD3FD9-0480-43CC-913C-4E0876DDA852}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{62033CC6-01CD-47A2-ADFD-188E9C524C0A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2EE63FDD-7F49-40BD-8A2E-240848B9FA83}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{0884566C-E013-4185-B223-47547AA75167}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{1491E558-9C19-4EAC-9406-868AB8181F38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{47B2D204-C993-4489-8B83-6DA7321CFAE0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
@ -563,6 +575,26 @@ Global @@ -563,6 +575,26 @@ Global
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
{62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Release|Any CPU.Build.0 = Release|Any CPU
{2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Release|Any CPU.Build.0 = Release|Any CPU
{0884566C-E013-4185-B223-47547AA75167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0884566C-E013-4185-B223-47547AA75167}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0884566C-E013-4185-B223-47547AA75167}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0884566C-E013-4185-B223-47547AA75167}.Release|Any CPU.Build.0 = Release|Any CPU
{1491E558-9C19-4EAC-9406-868AB8181F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1491E558-9C19-4EAC-9406-868AB8181F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1491E558-9C19-4EAC-9406-868AB8181F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1491E558-9C19-4EAC-9406-868AB8181F38}.Release|Any CPU.Build.0 = Release|Any CPU
{47B2D204-C993-4489-8B83-6DA7321CFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47B2D204-C993-4489-8B83-6DA7321CFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47B2D204-C993-4489-8B83-6DA7321CFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47B2D204-C993-4489-8B83-6DA7321CFAE0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -630,6 +662,12 @@ Global @@ -630,6 +662,12 @@ Global
{1F88F080-AD7C-4B03-9895-20C26282429D} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{60480C2F-F228-4D86-B98F-AF75A7DCEC34} = {1F88F080-AD7C-4B03-9895-20C26282429D}
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5} = {1F88F080-AD7C-4B03-9895-20C26282429D}
{FEDD3FD9-0480-43CC-913C-4E0876DDA852} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{62033CC6-01CD-47A2-ADFD-188E9C524C0A} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
{2EE63FDD-7F49-40BD-8A2E-240848B9FA83} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
{0884566C-E013-4185-B223-47547AA75167} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
{1491E558-9C19-4EAC-9406-868AB8181F38} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
{47B2D204-C993-4489-8B83-6DA7321CFAE0} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}

32
SharpDevelop.sln
Unescape View File

@ -109,6 +109,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", @@ -109,6 +109,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2", "src\AddIns\Misc\AddInManager2\Project\AddInManager2.csproj", "{60480C2F-F228-4D86-B98F-AF75A7DCEC34}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{7C3579BC-2A64-4108-82B5-3D07ADA079E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{9F0355DD-A394-4626-A2D9-112EBD1D36A9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
@ -417,6 +425,10 @@ Global @@ -417,6 +425,10 @@ Global
{0CD86A0B-73BB-4E7E-B476-AB84389164B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CD86A0B-73BB-4E7E-B476-AB84389164B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CD86A0B-73BB-4E7E-B476-AB84389164B1}.Release|Any CPU.Build.0 = Release|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Release|Any CPU.Build.0 = Release|Any CPU
{1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -449,10 +461,18 @@ Global @@ -449,10 +461,18 @@ Global
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E378E217-0C0C-473F-88A2-BF9748207511}.Release|Any CPU.Build.0 = Release|Any CPU
{6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Release|Any CPU.Build.0 = Release|Any CPU
{7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Release|Any CPU.Build.0 = Release|Any CPU
{9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -507,6 +527,10 @@ Global @@ -507,6 +527,10 @@ Global
{752BD058-5517-48A1-BB27-5ED186FA052B} = {87D549AF-8FCD-4E84-9C33-3DB6E42FEF6D}
{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {87D549AF-8FCD-4E84-9C33-3DB6E42FEF6D}
{60480C2F-F228-4D86-B98F-AF75A7DCEC34} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{6FB2FE2F-4E8C-4403-99AE-0474721FFD2E} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
{7C3579BC-2A64-4108-82B5-3D07ADA079E7} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
{9F0355DD-A394-4626-A2D9-112EBD1D36A9} = {4ABB8D1E-3439-44C8-ACCE-1FA678ABBFB3}
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}

6
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj
Unescape View File

@ -261,8 +261,6 @@ @@ -261,8 +261,6 @@
<DependentUpon>ReportViewerSecondaryView.cs</DependentUpon>
</Compile>
<Compile Include="Project\SecondaryViews\ReportViewerSecondaryView.cs" />
<Compile Include="Project\SecondaryViews\TestView\TestWPFReportPreview.cs" />
<Compile Include="Project\SecondaryViews\WPFReportPreview.cs" />
<Compile Include="Project\SecondaryViews\XmlView.cs" />
<Compile Include="Project\Services\DefaultMemberRelationshipService.cs" />
<Compile Include="Project\Services\DefaultServiceContainer.cs" />
@ -336,10 +334,6 @@ @@ -336,10 +334,6 @@
<Name>ICSharpCode.Data.SQLServer</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Reporting\ICSharpCode.Reporting\ICSharpCode.Reporting.csproj">
<Project>{40CA84D4-ACFC-4646-9CDD-B87262D34093}</Project>
<Name>ICSharpCode.Reporting</Name>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj">
<Project>{4B2239FF-8FD6-431D-9D22-1B8049BA6917}</Project>
<Name>ICSharpCode.Reports.Core</Name>

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs
Unescape View File

@ -53,7 +53,7 @@ namespace ICSharpCode.Reports.Addin @@ -53,7 +53,7 @@ namespace ICSharpCode.Reports.Addin
private XmlView xmlView;
private ReportPreview reportPreview;
private ReportViewerSecondaryView reportViewer;
private TestWPFReportPreview testView;
// private TestWPFReportPreview testView;
#region Constructor
@ -100,11 +100,11 @@ namespace ICSharpCode.Reports.Addin @@ -100,11 +100,11 @@ namespace ICSharpCode.Reports.Addin
reportViewer = new ReportViewerSecondaryView(loader,this);
SecondaryViewContents.Add(reportViewer);
var wpfViewer = new WPFReportPreview(loader,this);
SecondaryViewContents.Add(wpfViewer);
// var wpfViewer = new WPFReportPreview(loader,this);
// SecondaryViewContents.Add(wpfViewer);
testView = new TestWPFReportPreview(loader,this);
SecondaryViewContents.Add(testView);
// testView = new TestWPFReportPreview(loader,this);
// SecondaryViewContents.Add(testView);
}

23
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/FormattingFixture.cs
Unescape View File

@ -19,8 +19,6 @@ namespace ICSharpCode.Reports.Core.Test.Printing @@ -19,8 +19,6 @@ namespace ICSharpCode.Reports.Core.Test.Printing
private const string stringType = "System.String";
private const string dateTimetype = "System.DateTime";
private const string nullValue ="NullValue";
[Test]
public void String_Is_Not_Formatted()
{
@ -89,27 +87,6 @@ namespace ICSharpCode.Reports.Core.Test.Printing @@ -89,27 +87,6 @@ namespace ICSharpCode.Reports.Core.Test.Printing
Assert.That(result,Is.EqualTo("05:50:10"));
}
[Test]
public void NegativeTimeSpan_HH_mm_ss ()
{
string toFormat = "-5:50:10";
string format = "H:mm:ss";
var result = StandardFormatter.FormatOutput(toFormat,format,dateTimetype,nullValue);
Assert.That(result,Is.EqualTo("-5:50:10"));
}
[Test]
public void TimeSpan_HH_mm ()
{
string toFormat = "5:50:10";
string format = "HH:mm";
var result = StandardFormatter.FormatOutput(toFormat,format,dateTimetype,nullValue);
Assert.That(result,Is.EqualTo("05:50"));
}
[Test]
public void TimeSpan_H_mm_ss ()
{

Write Preview
Loading…
Cancel
Save