Cleanup

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

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerNodes.cs

@@ -81,16 +81,6 @@ namespace ICSharpCode.Reports.Addin
 	}
 	
 	
-	internal class FunctionNode:AbstractFieldsNode
-	{
-		public FunctionNode(string nodeName,int imageIndex):base(nodeName)
-		{
-			this.ImageIndex = imageIndex;
-			this.SelectedImageIndex = imageIndex;
-		}
-	}
-	
-	
 	internal class ParameterNode:AbstractFieldsNode
 	{
 		public ParameterNode(string nodeName,int imageIndex):base(nodeName)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanelControl.cs

@@ -72,6 +72,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		
 		public AvailableFieldsCollection AvailableFieldsCollection {
 			get { return availableFieldsCollection; }
+			
 			set {
 				availableFieldsCollection = value;
 				comboBox1.Items.Clear();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/PullModelPanel.cs

@@ -25,7 +25,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	/// </summary>
 	public class PullModelPanel : AbstractWizardPanel
 	{
-		private System.ComponentModel.IContainer components;
+	private System.ComponentModel.IContainer components;
 		private System.Windows.Forms.ToolTip toolTip1;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.TextBox txtSqlString;
@@ -39,7 +39,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
         private ElementHost databasesTreeHost;
         private DatabasesTreeView databasesTree;
 		
-		public enum NodeType {
+		private enum NodeType {
 			
 //			DataBaseRoot,
 //			dataBaseConnctionClose,
@@ -58,11 +58,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		public PullModelPanel()
 		{
 			InitializeComponent();
-            //sharpQueryTree = new SharpQueryTree();
+          
-            //sharpQueryTree.Dock = DockStyle.Fill;
-            //this.sharpQueryTree.AfterSelect += SharpQueryTreeAfterSelect;
-            //this.label2.Controls.Add(this.sharpQueryTree);
-
 			base.EnableFinish = false;
 			base.EnableNext = false;
 			base.EnableCancel = true;
@@ -70,6 +66,13 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			base.IsLastPanel = false;
 			commandType = CommandType.Text;
 			this.txtSqlString.Enabled = false;
+
+            this.databasesTreeHost = new ElementHost() { Dock = DockStyle.Fill };
+            this.databasesTree = new DatabasesTreeView();
+            this.databasesTree.SelectedItemChanged += new System.Windows.RoutedPropertyChangedEventHandler<object>(databasesTree_SelectedItemChanged);
+            this.databasesTreeHost.Child = this.databasesTree;
+            this.label2.Controls.Add(databasesTreeHost);
+
 			Localize();
 		}	
 	
@@ -100,29 +103,10 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 				reportStructure.SqlString = this.txtSqlString.Text.Trim();
 				reportStructure.ConnectionString = connectionString;
 				base.EnableFinish = true;
-				WriteResult();
-			}
-			else if (message == DialogMessage.Next) {
-				WriteResult();
-				base.EnableNext = true;
-				base.EnableFinish = true;
 			}
 			return true;
 		}
 		
-		private void WriteResult ()
-		{
-//			if (currentNode is SharpQueryNodeProcedure) {
-//				commandType = CommandType.StoredProcedure;
-//			} else {
-//				commandType = CommandType.Text;
-//			}
-			customizer.Set("SqlString", this.txtSqlString.Text.Trim());
-			reportStructure.CommandType = commandType;
-			reportStructure.SqlString = this.txtSqlString.Text.Trim();
-			reportStructure.ConnectionString = connectionString;
-		}
-		
 		#endregion
 		
 		#region events
@@ -164,7 +148,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
             e.Effect = DragDropEffects.None;
 		}
 		
-		/*
+		
 		private void TxtSqlStringDragDrop(object sender, System.Windows.Forms.DragEventArgs e){
 			if (firstDrag == true) {
 				this.txtSqlString.Clear();
@@ -206,7 +190,8 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
                         this.txtSqlString.AppendText(colName);
 
                     }
-                    else if (this.txtSqlString.Text.ToLower(CultureInfo.InvariantCulture).IndexOf("where", StringComparison.OrdinalIgnoreCase) > 0)
+                    //FxCop : http://msdn.microsoft.com/library/bb386042(VS.100).aspx
+                    else if (this.txtSqlString.Text.ToUpper(CultureInfo.InvariantCulture).IndexOf("where", StringComparison.OrdinalIgnoreCase) > 0)
                     {
                         this.txtSqlString.AppendText(colName + " = ?");
                     }
@@ -236,7 +221,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
             }
             base.EnableNext = true;
 		}
-*/
+
 
         private void databasesTree_SelectedItemChanged(object sender, System.Windows.RoutedPropertyChangedEventArgs<object> e)
         {
@@ -286,7 +271,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		/// if so, suround it with []</summary>
 		///<param name="SharpQueryNodeColumn">a ColumnNode</param>
 		/// <returns>a valid ColumnName</returns>
-		/// 
+	/*
 		private static string InferColumnName(string node) {
 			string colName;
 			if (node != null) {
@@ -301,11 +286,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			}
 			return colName;
 		}
+		*/
 		
 		
-		/*
 		// check witch type of node we dragg
-		private static NodeType CheckCurrentNode (ISharpQueryNode node) {
+		private static NodeType CheckCurrentNode (IDatabaseObjectBase node) {
 			NodeType enm;
 			if (node is IColumn) {
 				enm = NodeType.ColumnImage;
@@ -321,7 +306,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			}
 			return enm;
 		}
-		*/
+		
 		#endregion
 		
 		
@@ -359,7 +344,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			this.txtSqlString.Size = new System.Drawing.Size(264, 144);
 			this.txtSqlString.TabIndex = 8;
 			this.txtSqlString.TextChanged += new System.EventHandler(this.TxtSqlStringChanged);
-			//this.txtSqlString.DragDrop += new System.Windows.Forms.DragEventHandler(this.TxtSqlStringDragDrop);
+			this.txtSqlString.DragDrop += new System.Windows.Forms.DragEventHandler(this.TxtSqlStringDragDrop);
 			this.txtSqlString.DragEnter += new System.Windows.Forms.DragEventHandler(this.TxtSqlStringDragEnter);
 			// 
 			// label1

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs

@@ -118,7 +118,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			throw new MissingDataSourceException();
 		}
 	
-		
+		/*
 		private DataSet ExecuteStoredProc ()
 		{
 			
@@ -135,7 +135,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 				}
 			}
 		}
-		
+		*/
 		/*
 		private DataSet ExecuteStoredProc (SharpQueryProcedure procedure)
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -367,7 +367,6 @@
     <Folder Include="Project\Factories" />
     <Folder Include="Project\Globals" />
     <Folder Include="Project\Interfaces" />
-    <Folder Include="Project\DataSource" />
     <Folder Include="Project\Expressions" />
     <Folder Include="Project\ReportViewer\Resources\Icons" />
     <Folder Include="Project\Resources" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs

@@ -131,7 +131,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		#endregion
 		
-		protected  void ShowIndexList (IndexList list)
+		protected  static void ShowIndexList (IndexList list)
 		{
 			foreach (BaseComparer element in list) {
 				string s = String.Format("{0} ",element.ObjectArray[0]);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs

@@ -112,7 +112,7 @@ namespace ICSharpCode.Reports.Core
 			base.Group();
 			IndexList gl = new IndexList("group");
 			gl = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.GroupColumnsCollection));
-			base.ShowIndexList(gl);
+			ShowIndexList(gl);
 			BuildGroup(gl);
 			
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs

@@ -123,7 +123,6 @@ namespace ICSharpCode.Reports.Core.Exporter {
 	
 	internal class CalculatePdfFormat {
 		
-		iTextSharp.text.Font font;
 		TextStyleDecorator textDecorator;
 		
 		public CalculatePdfFormat (TextStyleDecorator textDecorator,iTextSharp.text.Font font)
@@ -134,9 +133,7 @@ namespace ICSharpCode.Reports.Core.Exporter {
 			if (font == null) {
 				throw new ArgumentNullException("font");
 			}
-			this.font = font;
 			this.textDecorator = textDecorator;
-//			this.leading = UnitConverter.FromPixel(textDecorator.Font.GetHeight()).Point;
 			this.Leading = font.Size;
 			this.CalculateFormat();
 		}