diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseGroupHeader.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseGroupHeader.cs index 505806cbfb..e28d6f4ef4 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseGroupHeader.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseGroupHeader.cs @@ -17,12 +17,12 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems /// Description of BaseGroupHeader. /// [Designer(typeof(GroupedRowDesigner))] - public class BaseGroupHeader:BaseRowItem + public class GroupHeader:BaseRowItem { - public BaseGroupHeader() + public GroupHeader() { - TypeDescriptor.AddProvider(new GroupedRowTypeProvider(), typeof(BaseGroupHeader)); + TypeDescriptor.AddProvider(new GroupedRowTypeProvider(), typeof(GroupHeader)); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs index f7ca89884a..76ecd5484a 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs @@ -95,7 +95,7 @@ namespace ICSharpCode.Reporting.Addin.Toolbox //GroupHeader - toolboxItem = new ToolboxItem(typeof(BaseGroupHeader)); + toolboxItem = new ToolboxItem(typeof(GroupHeader)); toolboxItem.Bitmap = IconService.GetBitmap("Icons.16x16.NameSpace"); toolboxItem.DisplayName = ResourceService.GetString("SharpReport.Toolbar.GroupHeader"); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseGroupHeader.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseGroupHeader.cs index d105b628a9..b615745c1b 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseGroupHeader.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseGroupHeader.cs @@ -13,14 +13,8 @@ namespace ICSharpCode.Reporting.Items /// /// Description of BaseGroupHeader. /// - public class BaseGroupHeader:BaseRowItem + public class GroupHeader:BaseRowItem { - public BaseGroupHeader() - { - } - - - public bool PageBreakOnGroupChange {get;set;} } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs index fac7c9dfa9..98ca29edc3 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs @@ -84,7 +84,7 @@ namespace ICSharpCode.Reporting.PageBuilder foreach (IGrouping grouping in DataSource.GroupedList) { - var groupHeader = (BaseRowItem)CurrentSection.Items.Where(p => p.GetType() == typeof(BaseGroupHeader)).FirstOrDefault(); + var groupHeader = (BaseRowItem)CurrentSection.Items.Where(p => p.GetType() == typeof(GroupHeader)).FirstOrDefault(); var sectionContainer = CreateContainerForSection(CurrentPage, pagePosition); DataSource.Fill(groupHeader.Items,grouping.FirstOrDefault()); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs index 4a46b189ed..32fe9c9bd0 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs @@ -54,7 +54,7 @@ namespace ICSharpCode.Reporting.Xml protected abstract Type GetTypeByName(string ns, string name); - private object ProcessNode(XmlNode node, object parent) + object ProcessNode(XmlNode node, object parent) { object ret=null; if (node is XmlElement) @@ -62,7 +62,7 @@ namespace ICSharpCode.Reporting.Xml // instantiate the class string ns=node.Prefix; string cname=node.LocalName; - + Type t=GetTypeByName(ns, cname); // Trace.Assert(t != null, "Type "+cname+" could not be determined."); @@ -75,8 +75,7 @@ namespace ICSharpCode.Reporting.Xml catch(Exception) { Console.WriteLine("MycroParser:"); - Console.WriteLine("\t Not found {0}",cname); -// Trace.Fail("Type "+cname+" could not be instantiated:\r\n"+e.Message); + Console.WriteLine("\t Not found {0} - {0}",cname); } // support the ISupportInitialize interface @@ -197,7 +196,7 @@ namespace ICSharpCode.Reporting.Xml } } - private void ProcessAttributes(XmlNode node, object ret, Type type) + void ProcessAttributes(XmlNode node, object ret, Type type) { // process attributes foreach(XmlAttribute attr in node.Attributes) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Reportingfactory/GroupedPushModel.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Reportingfactory/GroupedPushModel.cs index 641936601f..291988bfa1 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Reportingfactory/GroupedPushModel.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Reportingfactory/GroupedPushModel.cs @@ -30,7 +30,6 @@ namespace ICSharpCode.Reporting.Test.Reportingfactory IReportCreator reportCreator; [Test] - [Ignore] public void TestMethod() { reportCreator.BuildExportList();