Browse Source

Some renames, broken UnitTest is working again

pull/470/head
Peter Forstmeier 11 years ago
parent
commit
ef51be84a8
  1. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/BaseGroupHeader.cs
  2. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs
  3. 8
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseGroupHeader.cs
  4. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs
  5. 9
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs
  6. 1
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Reportingfactory/GroupedPushModel.cs

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

@ -17,12 +17,12 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems @@ -17,12 +17,12 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
/// Description of BaseGroupHeader.
/// </summary>
[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));
}

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

@ -95,7 +95,7 @@ namespace ICSharpCode.Reporting.Addin.Toolbox @@ -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");

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

@ -13,14 +13,8 @@ namespace ICSharpCode.Reporting.Items @@ -13,14 +13,8 @@ namespace ICSharpCode.Reporting.Items
/// <summary>
/// Description of BaseGroupHeader.
/// </summary>
public class BaseGroupHeader:BaseRowItem
public class GroupHeader:BaseRowItem
{
public BaseGroupHeader()
{
}
public bool PageBreakOnGroupChange {get;set;}
}

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

@ -84,7 +84,7 @@ namespace ICSharpCode.Reporting.PageBuilder @@ -84,7 +84,7 @@ namespace ICSharpCode.Reporting.PageBuilder
foreach (IGrouping<object, object> 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());

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

@ -54,7 +54,7 @@ namespace ICSharpCode.Reporting.Xml @@ -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 @@ -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 @@ -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 @@ -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)

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

@ -30,7 +30,6 @@ namespace ICSharpCode.Reporting.Test.Reportingfactory @@ -30,7 +30,6 @@ namespace ICSharpCode.Reporting.Test.Reportingfactory
IReportCreator reportCreator;
[Test]
[Ignore]
public void TestMethod()
{
reportCreator.BuildExportList();

Loading…
Cancel
Save