Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit ef51be8

Browse files
Some renames, broken UnitTest is working again
1 parent 53bba82 commit ef51be8

6 files changed

Lines changed: 10 additions & 18 deletions

File tree

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseGroupHeader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
1717
/// Description of BaseGroupHeader.
1818
/// </summary>
1919
[Designer(typeof(GroupedRowDesigner))]
20-
public class BaseGroupHeader:BaseRowItem
20+
public class GroupHeader:BaseRowItem
2121
{
2222

23-
public BaseGroupHeader()
23+
public GroupHeader()
2424
{
25-
TypeDescriptor.AddProvider(new GroupedRowTypeProvider(), typeof(BaseGroupHeader));
25+
TypeDescriptor.AddProvider(new GroupedRowTypeProvider(), typeof(GroupHeader));
2626
}
2727

2828

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static SideTab CreateReportingSidetab ()
9595

9696

9797
//GroupHeader
98-
toolboxItem = new ToolboxItem(typeof(BaseGroupHeader));
98+
toolboxItem = new ToolboxItem(typeof(GroupHeader));
9999
toolboxItem.Bitmap = IconService.GetBitmap("Icons.16x16.NameSpace");
100100
toolboxItem.DisplayName = ResourceService.GetString("SharpReport.Toolbar.GroupHeader");
101101

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseGroupHeader.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,8 @@ namespace ICSharpCode.Reporting.Items
1313
/// <summary>
1414
/// Description of BaseGroupHeader.
1515
/// </summary>
16-
public class BaseGroupHeader:BaseRowItem
16+
public class GroupHeader:BaseRowItem
1717
{
18-
public BaseGroupHeader()
19-
{
20-
}
21-
22-
23-
2418

2519
public bool PageBreakOnGroupChange {get;set;}
2620
}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void BuildGroupedDetails (IContainerConverter converter,Point startPosition) {
8484

8585
foreach (IGrouping<object, object> grouping in DataSource.GroupedList) {
8686

87-
var groupHeader = (BaseRowItem)CurrentSection.Items.Where(p => p.GetType() == typeof(BaseGroupHeader)).FirstOrDefault();
87+
var groupHeader = (BaseRowItem)CurrentSection.Items.Where(p => p.GetType() == typeof(GroupHeader)).FirstOrDefault();
8888
var sectionContainer = CreateContainerForSection(CurrentPage, pagePosition);
8989

9090
DataSource.Fill(groupHeader.Items,grouping.FirstOrDefault());

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ public object Load(XmlElement element)
5454

5555
protected abstract Type GetTypeByName(string ns, string name);
5656

57-
private object ProcessNode(XmlNode node, object parent)
57+
object ProcessNode(XmlNode node, object parent)
5858
{
5959
object ret=null;
6060
if (node is XmlElement)
6161
{
6262
// instantiate the class
6363
string ns=node.Prefix;
6464
string cname=node.LocalName;
65-
65+
6666
Type t=GetTypeByName(ns, cname);
6767

6868
// Trace.Assert(t != null, "Type "+cname+" could not be determined.");
@@ -75,8 +75,7 @@ private object ProcessNode(XmlNode node, object parent)
7575
catch(Exception)
7676
{
7777
Console.WriteLine("MycroParser:");
78-
Console.WriteLine("\t Not found {0}",cname);
79-
// Trace.Fail("Type "+cname+" could not be instantiated:\r\n"+e.Message);
78+
Console.WriteLine("\t Not found {0} - {0}",cname);
8079
}
8180

8281
// support the ISupportInitialize interface
@@ -197,7 +196,7 @@ protected void ProcessChildProperties(XmlNode node, object parent)
197196
}
198197
}
199198

200-
private void ProcessAttributes(XmlNode node, object ret, Type type)
199+
void ProcessAttributes(XmlNode node, object ret, Type type)
201200
{
202201
// process attributes
203202
foreach(XmlAttribute attr in node.Attributes)

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Reportingfactory/GroupedPushModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class GroupedPushModel
3030
IReportCreator reportCreator;
3131

3232
[Test]
33-
[Ignore]
3433
public void TestMethod()
3534
{
3635
reportCreator.BuildExportList();

0 commit comments

Comments
 (0)