Folder's are set correctly from ReportWizard

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1039 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

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

@@ -48,7 +48,7 @@ namespace SharpReportCore {
 			string formattedString = base.FireFormatOutput(this.dbValue,this.FormatString,"");
 			RectangleF rect = base.PrepareRectangle (e,formattedString);
 			base.PrintTheStuff (e,formattedString,rect);
-			base.OnAfterPrint (e.LocationAfterDraw);
+			base.NotiyfyAfterPrint (e.LocationAfterDraw);
 		}
 		
 		public override string ToString() {

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

@@ -167,7 +167,6 @@ namespace SharpReportCore {
 			}
 			set {
 				size = value;
-//				NotifyPropertyChanged ("Size",true);
 				NotifyPropertyChanged ("Size");
 			}
 		}
@@ -192,14 +191,14 @@ namespace SharpReportCore {
 			}
 		}
 		
-		public void OnAfterPrint (PointF afterPrint) {
+		public void NotiyfyAfterPrint (PointF afterPrintLocation) {
 			if (this.AfterPrinting != null) {
-				AfterPrintEventArgs rea = new AfterPrintEventArgs (afterPrint);
+				AfterPrintEventArgs rea = new AfterPrintEventArgs (afterPrintLocation);
 				AfterPrinting(this, rea);
 			}
 		}
 		
-		public void OnBeforePrint () {
+		public void NotifyBeforePrint () {
 			if (this.BeforePrinting != null) {
 				BeforePrinting (this,EventArgs.Empty);
 			}

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

@@ -37,7 +37,7 @@ namespace SharpReportCore {
 			base.Render(rpea);
 			RectangleF rect = PrepareRectangle (rpea,this.Text);
 			PrintTheStuff (rpea,this.Text,rect);
-			base.OnAfterPrint (rpea.LocationAfterDraw);
+			base.NotiyfyAfterPrint (rpea.LocationAfterDraw);
 		}
 		
 		public override string ToString() {

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Functions/BasePageNumber.cs

@@ -48,7 +48,7 @@ namespace SharpReportCore {
 				                                         rect,
 				                                         fmt);
 				
-				base.OnAfterPrint (e.LocationAfterDraw);
+				base.NotiyfyAfterPrint (e.LocationAfterDraw);
 			}
 			
 			public override string ToString() {

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Functions/BaseToday.cs

@@ -46,7 +46,7 @@ namespace SharpReportCore {
 			                                         fmt);
 			
 			// goon 
-			base.OnAfterPrint (e.LocationAfterDraw);
+			base.NotiyfyAfterPrint (e.LocationAfterDraw);
 		}
 		
 		public override string ToString() {

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

@@ -124,7 +124,8 @@ namespace SharpReportCore{
 		public BaseReportObject Find (string columnName) {
 			for (int i = 0;i < this.Count ; i ++) {
 				BaseReportObject col = this[i];
-				if (String.Compare(col.Name,columnName)== 0){
+				if (String.Compare(col.Name.ToLower(CultureInfo.CurrentCulture),
+				                   columnName.ToLower(CultureInfo.CurrentCulture))== 0){
 					return col;
 				}
 			}
@@ -149,7 +150,8 @@ namespace SharpReportCore{
 		public AbstractColumn Find (string columnName) {
 			for (int i = 0;i < this.Count ; i ++) {
 				AbstractColumn col = (AbstractColumn)this[i];
-				if (String.Compare(col.ColumnName,columnName)== 0){
+				if (String.Compare(col.ColumnName.ToLower(CultureInfo.CurrentCulture),
+				                   columnName.ToLower(CultureInfo.CurrentCulture))== 0){
 					return col;
 				}
 			}

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

@@ -14,16 +14,15 @@ using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
 
-using SharpReportCore;	
+//using SharpReportCore;	
-using System.Windows.Forms;
+
-
+/// <summary>
-	/// <summary>
+/// This Class is used as a wrapper around Databinding
-	/// This Class is used as a wrapper around Databinding
+/// </summary>
-	/// </summary>
+/// <remarks>
-	/// <remarks>
+/// 	created by - Forstmeier Peter
-	/// 	created by - Forstmeier Peter
+/// 	created on - 16.10.2005 14:49:43
-	/// 	created on - 16.10.2005 14:49:43
+/// </remarks>
-	/// </remarks>
 namespace SharpReportCore {	
 	
 		public class DataManager : IDataContainer,IEnumerator,IDisposable {
@@ -47,7 +46,7 @@ namespace SharpReportCore {
 		IDataViewStrategy dataViewStrategy;
 		
 		 
-//		private ListChangedEventArgs resetList = new ListChangedEventArgs(ListChangedType.Reset,-1,-1);
+		private ListChangedEventArgs resetList = new ListChangedEventArgs(ListChangedType.Reset,-1,-1);
 		
 		public event ListChangedEventHandler ListChanged;
 		public event EventHandler <GroupChangedEventArgs> GroupChanged;
@@ -71,7 +70,7 @@ namespace SharpReportCore {
 				
 				this.dataViewStrategy = new TableStrategy((DataTable)this.dataSource,
 				                                          reportSettings);
-				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (OnListChanged);
+				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (NotifyListChanged);
 			} catch (Exception) {
 				throw;
 			}
@@ -80,12 +79,11 @@ namespace SharpReportCore {
 		
 		public DataManager(DataTable dataSource, ReportSettings reportSettings){
 			try {
-				System.Console.WriteLine("DataManager (table,model");
 				CheckAndSetReportSettings(reportSettings);
 				CheckAndSetSource(dataSource);
 				this.dataViewStrategy = new TableStrategy((DataTable)this.dataSource,
 				                                          reportSettings);
-				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (OnListChanged);
+				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (NotifyListChanged);
 			} catch (Exception) {
 				throw ;
 			}
@@ -105,7 +103,7 @@ namespace SharpReportCore {
 				CheckAndSetSource(dataSource);
 				this.dataViewStrategy = new TableStrategy((DataTable)this.dataSource,
 				                                         reportSettings);
-				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (OnListChanged);
+				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (NotifyListChanged);
 			} catch (Exception ) {
 				throw ;
 			}
@@ -118,7 +116,7 @@ namespace SharpReportCore {
 				this.dataViewStrategy = new CollectionStrategy ((IList)this.dataSource,
 				                                                this.dataMember,
 				                                               reportSettings);
-				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (OnListChanged);
+				this.dataViewStrategy.ListChanged += new ListChangedEventHandler (NotifyListChanged);
 			} catch (Exception) {
 				throw;
 			}
@@ -132,17 +130,14 @@ namespace SharpReportCore {
 			if (settings == null) {
 				throw new ArgumentNullException("DataManager:ReportSettings");
 			}
-System.Console.WriteLine("CheckAndSetReportSettings");
 			try {
-	System.Console.WriteLine("\t {0}",settings.DataModel.ToString());
 				if (settings.DataModel != GlobalEnums.enmPushPullModel.PushData) {
 					SqlQueryCkecker check = new SqlQueryCkecker();
 					check.Check(settings.CommandText);
 				}
 				
-			} catch (Exception e) {
+			} catch (Exception) {
-				MessageBox.Show (e.Message);
+				throw;
-				throw ;
 			}
 			
 			this.reportSettings = settings;
@@ -150,11 +145,10 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 		
 		
 		void CheckAndSetSource(object source) {
-			System.Console.WriteLine("CheckAndSetSource");
 			if (source == null) {
 				throw new MissingDataSourceException();
-				
 			}
+			
 			if (source is IList ||source is IListSource || source is IBindingList) {
 				//DataTable
 				this.dataSource = source;
@@ -202,9 +196,7 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 		}
 		
 		void CheckConnection (ConnectionObject connectionObject) {
-			System.Console.WriteLine("CheckOnnection");
 			try {
-				
 				connection = connectionObject.Connection;
 				if (connection.State == ConnectionState.Open) {
 					connection.Close();
@@ -217,7 +209,6 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 		}
 		
 		private DataSet FillDataSet() {
-			System.Console.WriteLine("FillDataSet");
 			try {
 				if (this.connection.State == ConnectionState.Closed) {
 					this.connection.Open();
@@ -234,7 +225,7 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 				DataSet ds = new DataSet();
 				ds.Locale = CultureInfo.CurrentCulture;
 				adapter.Fill (ds);
-				System.Console.WriteLine("\t {0} in Table",ds.Tables[0].Rows.Count);
+//				System.Console.WriteLine("\t {0} in Table",ds.Tables[0].Rows.Count);
 				return ds;
 			} catch (Exception) {
 				throw;
@@ -289,13 +280,13 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 		
 		
 		#region Event Handling
-		private void OnListChanged (object sender, ListChangedEventArgs e) {
+		private void NotifyListChanged (object sender, ListChangedEventArgs e) {
 			if (this.ListChanged != null) {
 				this.ListChanged (this,e);
 			}
 		}
 		
-		private void OnGroupChange (object sender,GroupChangedEventArgs e) {
+		private void NotifyGroupChange (object sender,GroupChangedEventArgs e) {
 			
 			if (this.GroupChanged != null) {
 				this.GroupChanged (this,e);
@@ -398,8 +389,9 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 		
 		public bool DataBind() {
 			this.dataViewStrategy.Bind();
-			this.dataViewStrategy.GroupChanged += new EventHandler <GroupChangedEventArgs>(OnGroupChange);
+			this.dataViewStrategy.GroupChanged += new EventHandler <GroupChangedEventArgs>(NotifyGroupChange);
 			CheckReportColumns();
+//			this.NotifyListChanged (this,this.resetList);
 			return true;
 		}
 		

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

@@ -4,10 +4,10 @@ using System.Reflection;
 using System.Collections;
 using System.ComponentModel;
 
+
+using System.Collections.Generic;
 namespace SharpReportCore
 {
-	/// <summary>
-	/// This Class is the BaseClass for all Lists witch handles sorting,grouping etc.
 	
 	/// </summary>
 	public class SharpArrayList : ArrayList, IBindingList ,ITypedList,IExtendedList

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

@@ -12,7 +12,7 @@ using System.Text;
 using System.Collections;
 using System.Data;
 using System.ComponentModel;
-using System.Windows.Forms;
+
 using SharpReportCore;
 
 namespace SharpReportCore {
@@ -41,6 +41,7 @@ namespace SharpReportCore {
 //			MessageBox.Show ("On List Change");
 //		}
 		
+		/*
 		private string a_BuildSort(ColumnCollection sortCollection){
 			System.Console.WriteLine("BuildSort");
 			StringBuilder sb = new StringBuilder();	
@@ -61,6 +62,7 @@ namespace SharpReportCore {
 			System.Console.WriteLine("\tsort by {0}",sb.ToString());
 			return sb.ToString();
 		}
+		*/
 		#region Building the Index list
 		
 		// if we have no sorting, we build the indexlist as well, so we don't need to

src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs

@@ -39,7 +39,7 @@ namespace ReportGenerator{
 	public class CreateReport : AbstractMenuCommand {
 		const string WizardPath = "/ReportGenerator/ReportGeneratorWizard";
 		
-		private ReportModel reportModel = null;
+		private ReportModel reportModel;
 
 		private Properties customizer = new Properties();
 		
@@ -77,7 +77,7 @@ namespace ReportGenerator{
 		
 		void DoCreate (ReportModel model) {
 			GlobalEnums.enmPushPullModel dataModel;
-			dataModel = model.ReportSettings.DataModel;
+			dataModel = model.DataModel;
 			switch (dataModel) {
 				case GlobalEnums.enmPushPullModel.PullData:
 					GeneratePullReport (model);
@@ -101,7 +101,6 @@ namespace ReportGenerator{
 		void GeneratePullReport (ReportModel model) {
 			
 			try {
-				ReportGenerator reportGenerator = (ReportGenerator)customizer.Get("Generator");
 				GeneratePullDataReport generator = new GeneratePullDataReport(customizer,model);
 				if (generator != null) {
 					generator.GenerateReport();
@@ -119,17 +118,15 @@ namespace ReportGenerator{
 		/// </summary>
 		/// <param name="model">ReportModel</param> 
 		void GeneratePushReport (ReportModel model) {
-			
 			try {
-				ReportGenerator reportGenerator = (ReportGenerator)customizer.Get("Generator");
 				GeneratePushDataReport generator = new GeneratePushDataReport(customizer,model);
 				if (generator != null) {
 					generator.GenerateReport();
 				} else {
 					throw new NullReferenceException ("GeneratePullDataReport");
 				}
-			} catch (Exception) {
+			} catch (Exception e) {
-				throw;
+				throw e;
 			}
 		}
 		
@@ -142,7 +139,6 @@ namespace ReportGenerator{
 			
 			try {
 				model.ReportSettings.ReportType = GlobalEnums.enmReportType.FormSheet;
-				SharpReportManager manager = new SharpReportManager();
 			} catch (Exception e) {
 				throw e;
 			}

src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/AbstractReportGenerator.cs

@@ -45,7 +45,7 @@ namespace ReportGenerator {
 			this.customizer = customizer;
 			this.reportModel = reportModel;
 			if (reportModel == null) {
-				throw new ArgumentNullException("GeneratePullDataReport: <reportModel");
+				throw new ArgumentNullException("reportModel");
 			}
 			reportGenerator = (ReportGenerator)customizer.Get("Generator");
 			manager = new SharpReportManager();
@@ -63,7 +63,7 @@ namespace ReportGenerator {
 		//TODO Change these function to using SharpQuery
 		protected DataTable GenerateFieldsTable(ReportModel reportModel) {
 			if (reportModel == null) {
-				throw new ArgumentNullException("AbstractReportGenerator:GenerateFieldsTable No reportModel");
+				throw new ArgumentNullException("reportModel");
 			}
 			if (reportModel.ReportSettings.ConnectionString.Length == 0) {
 				throw new ArgumentException("CreateOLEDB Connection : No ConnectionString");
@@ -108,8 +108,8 @@ namespace ReportGenerator {
 						
 					}
 				}
-			} catch (Exception) {
+			} catch (Exception e) {
-				throw;
+				throw e;
 			}
 			OleDbDataReader reader = null;
 			DataTable schemaTable = null;

src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs

@@ -46,13 +46,13 @@ namespace ReportGenerator {
 		//Database
 		private GlobalEnums.enmPushPullModel dataModel;
 
-		private string connectionString = String.Empty;
+		private string connectionString;
-		private string catalogName = String.Empty;
+		private string catalogName;
-		private string sqlString = String.Empty;
+		private string sqlString;
 		
 		private CommandType commandType;
-		private SharpQueryProcedure sharpQueryProcedure = null;
+		private SharpQueryProcedure sharpQueryProcedure;
-		private ReportItemCollection reportItemCollection = null;
+		private ReportItemCollection reportItemCollection;
 		
 		private SharpQuerySchemaClassCollection queryParameters;
 		public ReportGenerator() {	
@@ -63,15 +63,14 @@ namespace ReportGenerator {
 			model.ReportSettings.ReportName = this.reportName;
 			model.ReportSettings.FileName = this.path + this.fileName;
 			
-			model.ReportSettings.GraphicsUnit = this.graphicsUnit;
 			
+			model.ReportSettings.GraphicsUnit = this.graphicsUnit;
 			model.ReportSettings.ReportType = this.reportType;
 
 			model.ReportSettings.ConnectionString = this.connectionString;
-
+			model.ReportSettings.CommandText = this.sqlString;
-			model.ReportSettings.CommandText = sqlString;
+			model.ReportSettings.CommandType = this.commandType;
-			model.ReportSettings.CommandType = commandType;
+			model.ReportSettings.DataModel = this.dataModel;
-			model.ReportSettings.DataModel = dataModel;
 			return model;
 		}
 		

src/AddIns/Misc/SharpReport/SharpReportWizard/ReportLayouts/TableLayout.cs

@@ -14,13 +14,13 @@ using System.ComponentModel;
 	
 using SharpReportCore;
 /// <summary>
-/// TODO - Add class summary
+/// This class build a TableLayout
 /// </summary>
 
 namespace ReportGenerator {	
 	public class TableLayout : AbstractLayout  {
 		
-		int colWidth = 0;
+		int colWidth;
 		Font defaultFont;
 		
 		public TableLayout(ReportModel reportModel):base(reportModel) {

src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs

@@ -8,10 +8,11 @@
  */
 
 using System;
-using System.ComponentModel;
 using System.Drawing;
+using System.Globalization;
+//using System.ComponentModel;
+
 using System.Windows.Forms;
-//using System.Windows.Forms.Design;
 
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop;
@@ -42,10 +43,10 @@ namespace ReportGenerator{
 		private System.Windows.Forms.Label label4;
 		private System.Windows.Forms.RadioButton radioFormSheet;
 		
-		ReportGenerator generator = null;
+		ReportGenerator generator;
-		Properties customizer        = null;
+		Properties customizer;
 	
-		bool initDone = false;
+		bool initDone;
 		
 		public BaseSettingsPanel(){	
 			InitializeComponent();
@@ -121,10 +122,10 @@ namespace ReportGenerator{
 				generator.ReportName = txtReportName.Text;
 				generator.FileName = txtFileName.Text;
 				generator.Path = this.txtPath.Text;
-
 				generator.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit),this.cboGraphicsUnit.Text);
 				SetSuccessor (this,new EventArgs());
 			}
+			
 		}
 		
 		
@@ -159,11 +160,19 @@ namespace ReportGenerator{
 			try {
 				ICSharpCode.SharpDevelop.Gui.FolderDialog ff = new ICSharpCode.SharpDevelop.Gui.FolderDialog();
 				ff.DisplayDialog("");
-				if (ff.Path.Length > 0) {
+				if (!String.IsNullOrEmpty(ff.Path)) {
-//					this.txtPath.Text = FileUtility.GetDirectoryNameWithSeparator(ff.Path.Trim());
+					if (!ff.Path.EndsWith(@"\")){
-					MessageBox.Show("BaseSettingPanel path : " +ff.Path);
+					                    
-					this.txtPath.Text = ff.Path;
+						this.txtPath.Text = ff.Path + @"\";
+						System.Console.WriteLine("added slash");
+					} else {
+						
+						this.txtPath.Text = ff.Path;
+						System.Console.WriteLine("no slash added");
+					}
+					generator.Path = this.txtPath.Text;
 				}
+				
 			} catch (Exception ) {
 				throw ;
 			}

src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PullModelPanel.cs

@@ -56,15 +56,15 @@ namespace ReportGenerator
 			nodeError
 		}
 		
-		private bool firstDrag = true;
+		private bool firstDrag;
-		private string connectionString = String.Empty;
+		private string connectionString;
-		private string catalogName = String.Empty;
+
 		private CommandType commandType;
 		
-		private ReportGenerator generator = null;
+		private ReportGenerator generator;
-		private Properties customizer = null;
+		private Properties customizer;
 		
-		private ISharpQueryNode currentNode = null;
+		private ISharpQueryNode currentNode;
 		
 		
 		public PullModelPanel()
@@ -74,6 +74,7 @@ namespace ReportGenerator
 			base.EnableFinish = false;
 			base.EnableNext = false;
 			base.EnableCancel = true;
+			this.firstDrag = true;
 			commandType = CommandType.Text;
 			this.txtSqlString.Enabled = false;
 			Localise();
@@ -134,8 +135,6 @@ namespace ReportGenerator
 		}
 		
 		void TxtSqlStringDragDrop(object sender, System.Windows.Forms.DragEventArgs e){
-			string strDrag = (string)e.Data.GetData(typeof(string));
-			
 			if (firstDrag == true) {
 				this.txtSqlString.Text = "";
 				firstDrag = false;
@@ -204,7 +203,6 @@ namespace ReportGenerator
 						
 						if (node.Connection.ConnectionString.Length > 0) {
 							this.connectionString = node.Connection.ConnectionString;
-							this.catalogName = node.Connection.CatalogName;
 							this.txtSqlString.Enabled = true;
 							
 							if (this.firstDrag) {

src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/PushModelPanel.cs

@@ -35,10 +35,10 @@ namespace ReportGenerator
 		private System.Windows.Forms.CheckedListBox checkedListBox;
 		private System.Windows.Forms.TextBox txtPath;
 		
-		private ReportGenerator generator = null;
+		private ReportGenerator generator;
-		private Properties customizer    = null;
+		private Properties customizer;
 		
-		private ReportItemCollection colDetail = null;
+		private ReportItemCollection colDetail;
 		
 		public PushModelPanel(){
 			InitializeComponent();

src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/ResultPanel.cs

@@ -41,8 +41,8 @@ namespace ReportGenerator{
 		private System.Windows.Forms.TextBox txtSqlString;
 		private System.Windows.Forms.DataGrid grdQuery;
 		
-		private ReportGenerator generator = null;
+		private ReportGenerator generator;
-		private Properties customizer    = null;
+		private Properties customizer;
 		
 		private SharpQuerySchemaClassCollection parametersClass;
 		
@@ -110,8 +110,8 @@ namespace ReportGenerator{
 					try {
 						// Stored Proc without Parameters
 						resultDataSet = (DataSet) proc.Execute(0,proc.GetSchemaParameters());
-					} catch (Exception) {
+					} catch (Exception e) {
-						throw;
+						throw e;
 					}
 					
 				}