Fixed problem in Reports with RowItems, refactoring of Loading Reports

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1447 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/SharpReport/Designer/Factories.cs

@@ -38,7 +38,8 @@ namespace SharpReport.Designer {
 		
 	public class IDesignableFactory : SharpReportCore.GenericFactory {
 			
-		public IDesignableFactory() :base(Assembly.GetExecutingAssembly(),typeof(IDesignable)){
+		public IDesignableFactory() :base(Assembly.GetExecutingAssembly(),
+			                                  typeof(IDesignable)){
 		}
 			
 		public new  BaseReportItem Create(string name) {

src/AddIns/Misc/SharpReport/SharpReport/Designer/IDesignerVisitor.cs

@@ -1,20 +0,0 @@
-/*
- * Created by SharpDevelop.
- * User: Forstmeier Helmut
- * Date: 10.08.2005
- * Time: 22:14
- * 
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
-
-/// <summary>
-/// Each DesignControl Visitor has to implement this Interface
-/// </summary>
-using System;
-
-namespace SharpReport.Designer{
-	public interface IDesignerVisitor  {
-		void Visit (SharpReport.Designer.BaseDesignerControl  designer);
-		}
-}
-		

src/AddIns/Misc/SharpReport/SharpReport/Designer/IVisitor.cs

@@ -1,21 +0,0 @@
-/*
- * Created by SharpDevelop.
- * User: Forstmeier Peter
- * Date: 10.08.2005
- * Time: 13:38
- * 
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
-
- using System;
- using SharpReport.Designer;
- 
- namespace SharpReport.Designer{
- 	/// <summary>
- 	/// Implemented in SharpReportDesigner
- 	/// </summary>
- 	
- 	public interface  IVisitor{
- 		void Accept(IDesignerVisitor visitor);
- 	}
- }

src/AddIns/Misc/SharpReport/SharpReport/Designer/SectionControls/BaseDesignerControl.cs

@@ -21,7 +21,7 @@ namespace SharpReport.Designer{
 	/// <summary>
 	/// Description of BaseDesignerControl.
 	/// </summary>
-	public class BaseDesignerControl : System.Windows.Forms.UserControl,SharpReport.Designer.IVisitor
+	public class BaseDesignerControl : UserControl,SharpReportCore.IVisitor
 	{
 		private SharpReport.Designer.Report reportControl;
 		private Ruler.ctrlRuler ctrlRuler1;
@@ -118,9 +118,12 @@ namespace SharpReport.Designer{
 		#endregion
 		
 		#region SharpReport.DelegatesInterfaces.IVisitor interface implementation
-		public void Accept(IDesignerVisitor visitor) {
+
-			visitor.Visit(this);
+		public void Accept(IModelVisitor visitor){
+			SharpReportCore.IModelVisitor v = visitor as SharpReportCore.IModelVisitor;
+			v.Visit(this);
 		}
+
 		#endregion
 		
 		

src/AddIns/Misc/SharpReport/SharpReport/SharpReport.csproj

@@ -62,8 +62,6 @@
     <Compile Include="Designer\VisualControls\ReportTextControl.cs" />
     <Compile Include="Designer\Factories.cs" />
     <Compile Include="Designer\IDesignable.cs" />
-    <Compile Include="Designer\IDesignerVisitor.cs" />
-    <Compile Include="Designer\IVisitor.cs" />
     <Compile Include="Designer\NameService.cs" />
     <Compile Include="Designer\Report.cs" />
     <Compile Include="Designer\XmlHelpers.cs" />
@@ -76,7 +74,6 @@
     <Compile Include="ReportItems\TextBased\ItemsHelper.cs" />
     <Compile Include="ReportItems\TextBased\ReportDataItem.cs" />
     <Compile Include="ReportItems\TextBased\ReportTextItem.cs" />
-    <Compile Include="Visitors\AbstractVisitor.cs" />
     <Compile Include="Visitors\LoadReportVisitor.cs" />
     <Compile Include="Visitors\SaveReportVisitor.cs" />
     <Compile Include="AutoReport.cs" />

src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs

@@ -261,7 +261,7 @@ namespace SharpReport{
 		public void  SaveToFile(string fileName){
 			try {
 				SharpReport.Visitors.SaveReportVisitor saveVisitor = new SharpReport.Visitors.SaveReportVisitor();
-				this.baseDesignerControl.Accept (saveVisitor);
+				this.baseDesignerControl.Accept ((SharpReportCore.IModelVisitor)saveVisitor);
 				XmlDocument xmlDoc = saveVisitor.XmlDocument;
 				XmlTextWriter xw = new XmlTextWriter (fileName,System.Text.Encoding.UTF8);
 				xmlDoc.PreserveWhitespace = true;

src/AddIns/Misc/SharpReport/SharpReport/Visitors/AbstractVisitor.cs

@@ -1,77 +0,0 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
-//     This code was generated by a tool.
-//     Runtime Version: 1.1.4322.2032
-//
-//     Changes to this file may cause incorrect behavior and will be lost if 
-//     the code is regenerated.
-// </autogenerated>
-//------------------------------------------------------------------------------
-using System;
-using System.Xml;
-	
-using SharpReport.Designer;
-	
-using SharpReportCore;
-namespace SharpReport.Visitors
-{
-	
-	
-	/// <summary>
-	/// Abstract Class for Designer Visitor
-	/// </summary>
-	/// <remarks>
-	/// 	created by - Forstmeier Peter
-	/// 	created on - 02.12.2004 16:53:00
-	/// </remarks>
-	public class AbstractVisitor : object, SharpReport.Designer.IDesignerVisitor {
-		private readonly string nodesQuery = "controls/control";	
-		private string fileName;
-		private XmlFormReader xmlFormReader;
-		
-		public AbstractVisitor() {
-		}
-		
-		public AbstractVisitor(string fileName){
-			this.fileName = fileName;
-			xmlFormReader = new XmlFormReader() ;
-		}
-		
-		
-		
-		/// <summary>
-		/// All classes how use this baseclass have to override this method
-		/// </summary>
-		/// <remarks>
-		/// Interface method from IDesignerVisitor
-		/// 
-		/// </remarks>
-		public virtual void Visit(SharpReport.Designer.BaseDesignerControl designer) {
-			
-		}
-		
-	
-		
-		#region Properties
-		protected string FileName {
-			get {
-				return fileName;
-			}
-		}
-		
-		protected XmlFormReader XmlFormReader {
-			get {
-				return xmlFormReader;
-			}
-		}
-		
-		protected string NodesQuery {
-			get {
-				return nodesQuery;
-			}
-		}
-		
-		#endregion
-		
-	}
-}

src/AddIns/Misc/SharpReport/SharpReport/Visitors/LoadReportVisitor.cs

@@ -28,9 +28,9 @@ using SharpReport.ReportItems;
 
 
 namespace SharpReport.Visitors {
-	public class LoadReportVisitor : SharpReport.Visitors.AbstractVisitor {
+
-		
+	public class LoadReportVisitor : SharpReportCore.AbstractModelVisitor {	
-		SharpReport.Designer.BaseDesignerControl designer;
+		SharpReport.Designer.BaseDesignerControl baseDesigner;
 		IDesignableFactory designableFactory ;
 		
 		public LoadReportVisitor(string fileName):base(fileName) {
@@ -41,16 +41,19 @@ namespace SharpReport.Visitors {
 		/// Loads ReportDefinition from File and set the values in the SharpReportDesigner
 		/// </summary>
 		/// <param name='designer'>SharpReportDesigner</param>
-		
+		public override void Visit(System.Windows.Forms.Control designer){
-		public override void Visit(SharpReport.Designer.BaseDesignerControl designer){
 			if (designer == null) {
 				throw new ArgumentNullException("designer");
 			}
+			this.baseDesigner = designer as SharpReport.Designer.BaseDesignerControl;
+			
+			if (this.baseDesigner == null) {
+				throw new ArgumentException("designer");
+			}
 			
 			XmlDocument xmlDoc;
 			try {
 				xmlDoc = XmlHelper.OpenSharpReport (base.FileName);
-				this.designer = designer;
 				SetDesigner (xmlDoc);
 				AdjustSectionsWidth();
 			} catch (Exception ) {
@@ -60,41 +63,36 @@ namespace SharpReport.Visitors {
 		}
 		
 		private void AdjustSectionsWidth() {
-			foreach (ReportSection section in designer.SectionsCollection) {
+			foreach (ReportSection section in baseDesigner.SectionsCollection) {
-				section.VisualControl.Width = designer.ReportModel.ReportSettings.PageSettings.Bounds.Width;
+				section.VisualControl.Width = baseDesigner.ReportModel.ReportSettings.PageSettings.Bounds.Width;
 				if (section.SectionMargin == 0) {
-					section.SectionMargin = designer.ReportModel.ReportSettings.PageSettings.Bounds.Left;
+					section.SectionMargin = baseDesigner.ReportModel.ReportSettings.PageSettings.Bounds.Left;
 				}
 			}
 		}
 		
 		
-		
 		private void  SetDesigner (XmlDocument doc){
-			this.designer.ReportModel.ReportSettings.SetSettings ((XmlElement)doc.DocumentElement.FirstChild);
+			this.baseDesigner.ReportModel.ReportSettings.SetSettings ((XmlElement)doc.DocumentElement.FirstChild);
 			SetSections (doc);
 		}
 		
 	
 		
 		private void SetSections (XmlDocument doc) {
-		
+			
 			XmlNodeList sectionNodes = doc.DocumentElement.ChildNodes;
 			//Start with node(1)
-			XmlNode node;
+
-			BaseSection baseSection = null;
 			for (int i = 1;i < sectionNodes.Count ; i++ ) {
-				node = sectionNodes[i];
+				XmlNode node = sectionNodes[i];
 				XmlElement sectionElem = node as XmlElement;
 				if (sectionElem != null) {
-					baseSection = (BaseSection)designer.ReportModel.SectionCollection.Find(sectionElem.GetAttribute("name"));
+					BaseSection baseSection = (BaseSection)baseDesigner.ReportModel.SectionCollection.Find(sectionElem.GetAttribute("name"));
-					if (baseSection != null) {
+
-						XmlHelper.SetSectionValues (base.XmlFormReader,sectionElem,baseSection);
+					XmlNodeList ctrlList = base.MakeSection(sectionElem,baseSection);
-						XmlNodeList ctrlList = sectionElem.SelectNodes (base.NodesQuery);
+					SetReportItems(baseSection,null,ctrlList);
-						SetReportItems(baseSection,null,ctrlList);
+
-					} else {
-						throw new MissingSectionException();
-					}
 				} else {
 					throw new MissingSectionException();
 				}
@@ -106,7 +104,6 @@ namespace SharpReport.Visitors {
 		                    IContainerItem parentContainer,XmlNodeList ctrlList) {
 			
 			BaseReportItem baseReportItem;
-			//BaseReportItem parentItem;
 			foreach (XmlNode ctrlNode in ctrlList) {
 				XmlElement ctrlElem = ctrlNode as XmlElement;
 				if (ctrlElem != null) {
@@ -114,28 +111,12 @@ namespace SharpReport.Visitors {
 					try {
 						itemRenderer = designableFactory.Create(ctrlElem.GetAttribute("type"));
 						
-						baseReportItem = (BaseReportItem)itemRenderer;
+						baseReportItem = base.MakeItem(ctrlElem,parentContainer,baseSection,itemRenderer);
-					
-						baseReportItem.SuspendLayout();
-						XmlHelper.SetReportItemValues (base.XmlFormReader,ctrlElem,baseReportItem);
-	
-						if (parentContainer == null) {
-							baseReportItem.Parent = baseSection;
-							baseSection.Items.Add (baseReportItem);
-						} else {
-							baseReportItem.Parent = parentContainer;
-							parentContainer.Items.Add(baseReportItem);
-							
-						}
-						baseReportItem.ResumeLayout();
 						IContainerItem iContainer = baseReportItem as IContainerItem;
 						
 						if (iContainer != null) {
 							XmlNodeList newList = ctrlNode.SelectNodes (base.NodesQuery);
 							if (newList.Count > 0) {
-								System.Console.WriteLine("\tLoadReportVisitor recursive call for <{0}> with {1} elements",
-								                         baseReportItem.Name,
-								                         newList.Count);
 								SetReportItems (baseSection,iContainer,newList);
 							}
 						}

src/AddIns/Misc/SharpReport/SharpReport/Visitors/SaveReportVisitor.cs

@@ -20,17 +20,22 @@ namespace SharpReport.Visitors{
 	/// Description of SaveReportVisitor.
 	/// </summary>
 	
-	public class SaveReportVisitor : AbstractVisitor
+	public class SaveReportVisitor :SharpReportCore.AbstractModelVisitor
 	{
 		
 		private XmlDocument xmlDoc;
+		private SharpReport.Designer.BaseDesignerControl baseDesigner;
 		
-		public SaveReportVisitor ():base() {
+		public SaveReportVisitor ():base(String.Empty) {
 			
 		}
-		
+		public override void Visit (Control designer) {
-		public override void Visit (SharpReport.Designer.BaseDesignerControl designer) {
+			this.baseDesigner = designer as SharpReport.Designer.BaseDesignerControl;
-			xmlDoc = this.BuildReportDocument(designer);
+			
+			if (this.baseDesigner == null) {
+				throw new ArgumentException("designer");
+			}
+			xmlDoc = this.BuildReportDocument(baseDesigner);
 		}
 		
 		private XmlDocument BuildReportDocument (SharpReport.Designer.BaseDesignerControl designer) {

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseDataItem.cs

@@ -68,6 +68,7 @@ namespace SharpReportCore {
 			string toPrint = CheckForNullValue();
 			
 			base.Text = base.FireFormatOutput(toPrint,this.FormatString,"");
+//			System.Console.WriteLine("\tBaseDataItem <{0}> / <{1}>",this.Name,this.Text);
 			base.Render (rpea);
 			
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/RowItem.cs

@@ -35,14 +35,15 @@ namespace SharpReportCore{
 		
 		public RowItem(string tableName){
 			this.tableName = tableName;
-			this.Items.Added += OnAdded;
+//			this.Items.Added += OnAdded;
 		}
 		
+		/*
 		void OnAdded (object sender, CollectionItemEventArgs<IItemRenderer> e){			
 			System.Console.WriteLine("");
 			System.Console.WriteLine("RowItem:OnAdded did we use this function???");
 		}
-		
+		*/
 		#region overrides
 		
 		
@@ -58,8 +59,8 @@ namespace SharpReportCore{
 			if (rpea == null) {
 				throw new ArgumentNullException("rpea");
 			}
-			System.Console.WriteLine("");
+//			System.Console.WriteLine("");
-			System.Console.WriteLine("--Start of {0}",this.ToString());
+//			System.Console.WriteLine("--Start of {0}",this.ToString());
 			base.Render(rpea);
 			RectangleF rect = PrepareRectangle (rpea);
 			
@@ -83,8 +84,8 @@ namespace SharpReportCore{
 				childItem.Render (rpea);
 				childItem.Location = new Point(loc.X,loc.Y);
 			}
-			System.Console.WriteLine("--End of RowItem");
+//			System.Console.WriteLine("--End of RowItem");
-			System.Console.WriteLine("");
+//			System.Console.WriteLine("");
 			base.NotiyfyAfterPrint (rpea.LocationAfterDraw);
 		}
 		

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs

@@ -35,8 +35,8 @@ namespace SharpReportCore {
 		GroupSeperator groupSeperator;
 		
 		public event EventHandler <ListChangedEventArgs> ListChanged;
-		public event EventHandler <GroupChangedEventArgs> GroupChanged;
+//		public event EventHandler <GroupChangedEventArgs> GroupChanged;
-		public event EventHandler <EventArgs> GroupChanging;
+//		public event EventHandler <EventArgs> GroupChanging;
 		
 		/// <summary>
 		/// use this Constructor for PullDataReports
@@ -62,7 +62,7 @@ namespace SharpReportCore {
 			this.dataViewStrategy = new TableStrategy((DataTable)this.dataSource,
 			                                          reportSettings);
 			this.dataViewStrategy.ListChanged += new EventHandler <ListChangedEventArgs> (NotifyListChanged);
-			this.dataViewStrategy.GroupChanged += new EventHandler<GroupChangedEventArgs> (OnGroupChange);
+//			this.dataViewStrategy.GroupChanged += new EventHandler<GroupChangedEventArgs> (OnGroupChange);
 		}
 		
 		public DataManager(DataTable dataSource, ReportSettings reportSettings){
@@ -272,18 +272,18 @@ namespace SharpReportCore {
 		}
 		
 		private void NotifyGroupChanging () {
-			if (this.GroupChanging!= null) {
+//			if (this.GroupChanging!= null) {
-				this.GroupChanging (this,EventArgs.Empty);
+//				this.GroupChanging (this,EventArgs.Empty);
-			}		
+//			}		
 		}
 		
+		
 		private void NotifyGroupChanged() {
 			if (this.IsGrouped) {
-				if (this.GroupChanged != null) {
+//				if (this.GroupChanged != null) {
-					this.GroupChanged (this,new GroupChangedEventArgs(this.groupSeperator));
+//					this.GroupChanged (this,new GroupChangedEventArgs(this.groupSeperator));
-				}
+//				}
 			}
-			
 		}
 		
 		private void OnGroupChange (object sender,GroupChangedEventArgs e) {
@@ -384,7 +384,6 @@ namespace SharpReportCore {
 			}
 		}
 	
-		// Nur zum testen
 		
 		public DataNavigator GetNavigator {
 			get {
@@ -393,22 +392,6 @@ namespace SharpReportCore {
 		}
 		
 
-		/*
-		public object Current {
-			get {
-				throw new NotImplementedException();
-			}
-		}
-		*/
-//		public void Reset() {
-//			this.dataViewStrategy.Reset();
-//		}
-//		
-//		public bool MoveNext() {
-//			return this.dataViewStrategy.MoveNext();
-//		}
-		
-		
 		
 		public bool IsGrouped {
 			get {
@@ -427,6 +410,7 @@ namespace SharpReportCore {
 				return this.dataViewStrategy.IsFiltered;
 			}
 		}
+		
 		#region System.IDisposable interface implementation
 		public void Dispose() {
 			this.Dispose(true);

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataNavigator.cs

@@ -17,12 +17,16 @@ namespace SharpReportCore
 	
 	public class DataNavigator :IDataNavigator{
 		IDataViewStrategy store;
-		public event EventHandler <ListChangedEventArgs> ListChanged;
+		GroupSeperator groupSeperator;
 		
+		public event EventHandler <ListChangedEventArgs> ListChanged;
+//		public event EventHandler <EventArgs> GroupChanging;
+		public event EventHandler <GroupChangedEventArgs> GroupChanged;
 		
 		public DataNavigator(IDataViewStrategy store){
 			this.store = store;
 			this.store.ListChanged += new EventHandler<ListChangedEventArgs> (OnListChanged);
+			this.store.GroupChanged += new EventHandler<GroupChangedEventArgs> (OnGroupChange);
 		}
 
 		private void OnListChanged (object sender,System.ComponentModel.ListChangedEventArgs e) {
@@ -31,10 +35,34 @@ namespace SharpReportCore
 			}
 		}
 		
+//		private void NotifyGroupChanging () {
+//			if (this.GroupChanging!= null) {
+//				this.GroupChanging (this,EventArgs.Empty);
+//			}		
+//		}
+		
+		private void NotifyGroupChanged() {
+			if (this.store.IsGrouped) {
+				if (this.GroupChanged != null) {
+					this.GroupChanged (this,new GroupChangedEventArgs(this.groupSeperator));
+				}
+			}
+		}
+		
+		private void OnGroupChange (object sender,GroupChangedEventArgs e) {
+			this.groupSeperator = e.GroupSeperator;
+			this.NotifyGroupChanged();
+		}
+		
+		#region IDataNavigator implementation
+		
 		public void Fill (ReportItemCollection collection) {
+//			this.NotifyGroupChanging();
+			this.NotifyGroupChanged();
 			foreach (IItemRenderer item in collection) {
 				this.store.Fill(item);
 			}
+//			this.NotifyGroupChanged();
 		}
 		
 		
@@ -79,5 +107,7 @@ namespace SharpReportCore
 				return this.store.Current;
 			}
 		}
+		
+		#endregion
 	}
 }

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/ListStrategy/CollectionStrategy.cs

@@ -212,13 +212,15 @@ namespace SharpReportCore {
 		public override void Bind() {
 			base.Bind();
 			
-			if ((base.ReportSettings.GroupColumnsCollection != null) && (base.ReportSettings.GroupColumnsCollection.Count > 0)) {
+//			if ((base.ReportSettings.GroupColumnsCollection != null) && (base.ReportSettings.GroupColumnsCollection.Count > 0)) {
+			if (base.ReportSettings.GroupColumnsCollection.Count > 0) {
 				this.Group ();
 				Reset();
 				return;
 			}
 			
 			if (base.ReportSettings.SortColumnCollection != null) {
+//			if (base.ReportSettings.SortColumnCollection.Count > 0) {	
 				this.Sort ();
 			}
 			Reset();

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/ListStrategy/TableStrategy.cs

@@ -92,8 +92,6 @@ namespace SharpReportCore {
 		
 		#region Grouping
 		
-		
-		
 		private void BuildGroup(){
 			try {
 				SharpIndexCollection groupedArray = new SharpIndexCollection();
@@ -168,15 +166,14 @@ namespace SharpReportCore {
 		public override void Bind() {
 			base.Bind();
 
-			if ((base.ReportSettings.GroupColumnsCollection != null) && (base.ReportSettings.GroupColumnsCollection.Count > 0)) {
+			if (base.ReportSettings.GroupColumnsCollection.Count > 0) {
 				this.Group ();
 				Reset();
 				return;
 			}
 			
-			if (base.ReportSettings.SortColumnCollection != null) {
 				this.Sort ();
-			}
+
 			Reset();
 		}
 	
@@ -208,7 +205,7 @@ namespace SharpReportCore {
 			try {
 				base.Fill(item);
 				if (this.Current == null) {
-					System.Console.WriteLine("ow is null");
+					System.Console.WriteLine("row is null");
 				}
 				if (this.row != null) {
 					BaseDataItem baseDataItem = item as BaseDataItem;
@@ -239,6 +236,7 @@ namespace SharpReportCore {
 		public override int Count {
 			get {
 				return this.IndexList.Count;
+//				return this.view.Count;
 			}
 		}
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractDataRenderer.cs

@@ -39,7 +39,6 @@ namespace SharpReportCore{
 		
 		
 		protected override int RenderSection(BaseSection section, ReportPageEventArgs rpea){
-		
 			bool hasContainer = false;
 			IContainerItem container = null;
 			foreach (BaseReportItem item in section.Items) {
@@ -54,7 +53,7 @@ namespace SharpReportCore{
 			} else {
 				return base.RenderSection(section, rpea);
 			}
-			
+
 		}
 		
 		private int DoContainerControl (BaseSection section,
@@ -64,7 +63,6 @@ namespace SharpReportCore{
 			if (container == null) {
 				return section.Size.Height;
 			}
-			
 			this.DataNavigator.Fill(container.Items);
 			Point drawPoint	= new Point(0,0);
 			if (section.Visible){
@@ -81,10 +79,8 @@ namespace SharpReportCore{
 					
 				}
 				if ((section.CanGrow == false)&& (section.CanShrink == false)) {
-					return section.Size.Height;
+					return section.Size.Height;					
-					
+				}				
-				}
-				
 				return drawPoint.Y;
 			}
 			return drawPoint.Y;

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs

@@ -219,6 +219,7 @@ namespace SharpReportCore {
 		
 		protected void DrawSingleItem (ReportPageEventArgs rpea,BaseReportItem item){
 			item.SuspendLayout();
+//			System.Console.WriteLine("\tDrawSingleItem {0}",item.Name);
 			item.FormatOutput -= new EventHandler<FormatOutputEventArgs> (FormatBaseReportItem);
 			item.FormatOutput += new EventHandler<FormatOutputEventArgs> (FormatBaseReportItem);
 			item.Render(rpea);
@@ -227,10 +228,11 @@ namespace SharpReportCore {
 	
 		// Called by FormatOutPutEvent of the BaseReportItem
 		void FormatBaseReportItem (object sender, FormatOutputEventArgs rpea) {
-//			System.Console.WriteLine("FormatBaseReportItem");
 			BaseDataItem baseDataItem = sender as BaseDataItem;
+			
 			if (baseDataItem != null) {
 				if (!String.IsNullOrEmpty(baseDataItem.FormatString)) {
+					
 					rpea.FormatedValue = defaultFormatter.FormatItem (baseDataItem);
 //					System.Console.WriteLine("\tFormated Value = {0}",rpea.FormatedValue);
 				} else {

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs

@@ -47,8 +47,8 @@ namespace SharpReportCore {
 
 		
 		public RenderDataReport(ReportModel model,DataManager dataManager):base (model,dataManager){
-			base.DataManager.GroupChanged += new EventHandler<GroupChangedEventArgs>(OnGroupChanged);
+//			base.DataManager.GroupChanged += new EventHandler<GroupChangedEventArgs>(OnGroupChanged);
-			base.DataManager.GroupChanging += new EventHandler <EventArgs> (OnGroupChanging);
+//			base.DataManager.GroupChanging += new EventHandler <EventArgs> (OnGroupChanging);
 		}
 		
 
@@ -156,7 +156,7 @@ namespace SharpReportCore {
 		}
 		
 		protected override void BeginPrintPage(object sender, ReportPageEventArgs rpea) {
-			System.Console.WriteLine("!!! Beginprintpage");
+			System.Console.WriteLine("!!! BeginPrintpage");
 			if (rpea == null) {
 				throw new ArgumentNullException("rpea");
 			}
@@ -206,7 +206,6 @@ namespace SharpReportCore {
 			while (this.dataNavigator.MoveNext()) {
 				this.dataNavigator.Fill (base.CurrentSection.Items);	
 				base.RenderSection (section,rpea);
-				
 				section.SectionOffset = section.SectionOffset + section.Size.Height  + 2 * base.Gap;
 				
 				base.FitSectionToItems (base.CurrentSection,rpea);

src/AddIns/Misc/SharpReport/SharpReportCore/ReportModel.cs

@@ -32,10 +32,8 @@ namespace SharpReportCore {
 	using System;
 	using System.Drawing;
 	using SharpReportCore;
-	
+
-	
+	public class ReportModel : object,SharpReportCore.IVisitor,IDisposable{	
-	public class ReportModel : object,SharpReportCore.IModel,IDisposable{
-		
 		ReportSettings reportSettings;
 		ReportSectionCollection sectionCollection;
 	

src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs

@@ -505,7 +505,7 @@ namespace SharpReportCore {
 			
 			try {
 				ReportModel model = new ReportModel();
-				SharpReportCore.LoadModelVisitor modelVisitor = new SharpReportCore.LoadModelVisitor(model,fileName);
+				SharpReportCore.LoadModelVisitor modelVisitor = new SharpReportCore.LoadModelVisitor(model,fileName);                                                                                    
 				model.Accept (modelVisitor);
 				return model;
 			} catch (Exception) {

src/AddIns/Misc/SharpReport/SharpReportCore/Visitors/AbstractModelVisitor.cs

@@ -8,7 +8,7 @@
 // </autogenerated>
 //------------------------------------------------------------------------------
 using System;
-
+using System.Xml;
 /// <summary>
 /// Base Class for ModelVisitor
 /// </summary>
@@ -18,18 +18,79 @@ using System;
 /// </remarks>
 namespace SharpReportCore {	
 	public class AbstractModelVisitor : object, SharpReportCore.IModelVisitor {
+		private readonly string nodesQuery = "controls/control";
+		private SharpReportCore.XmlFormReader xmlFormReader;
+		private string fileName;
+//		private GenericFactory genericFactory;
 		
 		/// <summary>
 		/// Default constructor - initializes all fields to default values
 		/// </summary>
-		public AbstractModelVisitor() {
+
+		
+		public AbstractModelVisitor(string fileName){
+			this.fileName = fileName;
+			xmlFormReader = new XmlFormReader() ;
+		}
+		
+		protected XmlNodeList MakeSection (XmlElement sectionElem,BaseSection baseSection) {
+			if (baseSection == null) {
+				throw new MissingSectionException();
+			}
+			baseSection.SuspendLayout();
+			XmlHelper.SetSectionValues (xmlFormReader,sectionElem,baseSection);
+			baseSection.ResumeLayout();
+			return BuildControlList(sectionElem);
+		}
+		
+		
+		protected BaseReportItem MakeItem (XmlElement elem,IContainerItem parent,
+		                                  BaseSection section,IItemRenderer itemRenderer) {
+			
+			BaseReportItem item = (BaseReportItem)itemRenderer;
+			item.SuspendLayout();
+			XmlHelper.SetReportItemValues (xmlFormReader,elem,item);
+			if (parent == null) {
+				item.Parent = section;
+				section.Items.Add (item);
+			} else {
+				item.Parent = parent;
+				parent.Items.Add(item);
+			}
+			item.ResumeLayout();
+			return item;
 		}
 		
+		protected XmlNodeList BuildControlList(XmlElement section) {
+			return section.SelectNodes (this.nodesQuery);
+		}
+		
+		protected string NodesQuery {
+			get {
+				return nodesQuery;
+			}
+		}
+		
+		protected XmlFormReader XmlFormReader {
+			get {
+				return xmlFormReader;
+			}
+		}
 		
 		
+		protected string FileName {
+			get {
+				return fileName;
+			}
+		}
+	
+
 		#region SharpReport.DelegatesInterfaces.IModelVisitor interface implementation
 		public virtual void Visit(SharpReportCore.ReportModel reportModel) {
-			
+			throw new NotImplementedException();
+		}
+		public virtual void Visit (System.Windows.Forms.Control designer){
+			throw new NotImplementedException();
 		}
 		#endregion
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Visitors/IVisitor.cs

@@ -11,13 +11,24 @@ using System;
 
 
 namespace SharpReportCore{
-		
+	
-	public interface IModel{
+	/// <summary>
-			void Accept(IModelVisitor visitor);
+	/// Used by <see cref="SharpReport.Designer.BaseDesignerControl"></see>
-	}	
+	/// </summary>
+	
+	public interface  IVisitor{
+		void Accept(SharpReportCore.IModelVisitor visitor);
+	}
 	
 	public interface IModelVisitor{
+			///<summary>
+			/// Use this function to Visit from ReportEngine
+			/// </summary>
 			void Visit (SharpReportCore.ReportModel reportModel);
+			///<summary>
+			/// This function is used by the Designer
+			/// </summary>
+			void Visit (System.Windows.Forms.Control designer);
 	}
 }
 	

src/AddIns/Misc/SharpReport/SharpReportCore/Visitors/LoadModelVisitor.cs

@@ -25,13 +25,11 @@ using SharpReportCore;
 namespace SharpReportCore {	
 	public class LoadModelVisitor : SharpReportCore.AbstractModelVisitor {
 		
-		private string fileName;
 		private ReportModel model;
-		SharpReportCore.XmlFormReader xmlFormReader;
 		BaseItemFactory baseItemFactory;
 		
-		public LoadModelVisitor(ReportModel reportModel,string fileName){
+		public LoadModelVisitor(ReportModel reportModel,
-			this.fileName = fileName;
+		                        string fileName):base(fileName){
 			this.model = reportModel;
 			baseItemFactory = new BaseItemFactory();
 		}
@@ -40,12 +38,11 @@ namespace SharpReportCore {
 		#region overrides
 		public override void Visit(ReportModel reportModel) {
 			if (reportModel == null) {
-				throw new MissingModelException();
+				throw new ArgumentNullException("reportModel");
 			} else {
 				XmlDocument xmlDoc;
 				try {
-					xmlDoc = XmlHelper.OpenSharpReport (fileName);
+					xmlDoc = XmlHelper.OpenSharpReport (base.FileName);
-					xmlFormReader = new XmlFormReader();
 					reportModel.ReportSettings.SetSettings ((XmlElement)xmlDoc.DocumentElement.FirstChild);
 					SetSections (xmlDoc);
 				} catch (Exception ) {
@@ -60,48 +57,51 @@ namespace SharpReportCore {
 		void SetSections (XmlDocument doc) {
 			XmlNodeList sectionNodes = doc.DocumentElement.ChildNodes;
 			//Start with node(1)
-			XmlNode node;
+
-			BaseSection baseSection;
 			for (int i = 1;i < sectionNodes.Count ; i++ ) {
-				node = sectionNodes[i];
+				XmlNode node = sectionNodes[i];
 				
 				if (node is XmlElement) {
 					XmlElement sectionElem = (XmlElement)node;
-					baseSection = (BaseSection)model.SectionCollection.Find(sectionElem.GetAttribute("name"));
+					
-					baseSection.SuspendLayout();
+					BaseSection baseSection = (BaseSection)model.SectionCollection.Find(sectionElem.GetAttribute("name"));
-					if (baseSection != null) {
+					
-						XmlHelper.SetSectionValues (xmlFormReader,sectionElem,baseSection);
+					XmlNodeList ctrlList = base.MakeSection(sectionElem,baseSection);
-						XmlNodeList ctrlList = sectionElem.SelectNodes ("controls/control");
+					SetReportItems(baseSection,null,ctrlList);
-						if (ctrlList.Count > 0) {
+					
-							foreach (XmlNode ctrlNode in ctrlList) {
+				}else {
-								if (ctrlNode is XmlElement) {
+					throw new System.Xml.XmlException ("Report : SetSection Wrong Node in Report");
-									XmlElement ctrlElem = (XmlElement)ctrlNode;
+				}
-									BaseReportItem rpt = null;
+			}
-									try {
+		}
-										//Read the <BaseClassName> Element
+		
-										rpt = (BaseReportItem)baseItemFactory.Create(ctrlElem.GetAttribute("basetype"));
+		
-										if (rpt != null) {
+		void SetReportItems(BaseSection baseSection,
-//											rpt.SuspendLayout();
+		                    IContainerItem parentContainer,XmlNodeList ctrlList) {
-											rpt.Parent = baseSection;
+			
-											baseSection.Items.Add (rpt);
+			BaseReportItem baseReportItem;
-											XmlHelper.SetReportItemValues (xmlFormReader,ctrlElem,rpt);
+		
-											rpt.Visible = true;
+			foreach (XmlNode ctrlNode in ctrlList) {
-											rpt.ResumeLayout();
+				XmlElement ctrlElem = ctrlNode as XmlElement;
-										} else {
+				if (ctrlElem != null) {
-											String str = String.Format("< {0}>",ctrlElem.GetAttribute("basetype"));
+					IItemRenderer itemRenderer = null;
-											throw new UnkownItemException(str);
+					try {
-										}
+						itemRenderer = baseItemFactory.Create(ctrlElem.GetAttribute("basetype"));
-									} catch (Exception ) {
+						baseReportItem = base.MakeItem (ctrlElem,parentContainer,baseSection,itemRenderer);
-										throw;
+						
-									}
+						IContainerItem iContainer = baseReportItem as IContainerItem;
-								}
+						
+						if (iContainer != null) {
+							XmlNodeList newList = ctrlNode.SelectNodes (base.NodesQuery);
+							if (newList.Count > 0) {
+								SetReportItems (baseSection,iContainer,newList);
 							}
 						}
-					}else {
+						
-						throw new MissingSectionException();
+					}
+					catch (Exception ) {
+						throw new UnkownItemException();
 					}
-				}else {
-					throw new System.Xml.XmlException ("Report : SetSection Wrong Node in Report");
 				}
 			}
 		}