CQA - OverviewReport, Parameters missing

Author: PeterForstmeier

src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml

@@ -12,7 +12,7 @@
 
 			<Menu Background="White" x:Name="printMenu" Visibility="Hidden">
 				<MenuItem Header="Reports">
-					<!--<MenuItem Header="Overview" Click="OverviewReport_Click"></MenuItem>-->
+					<MenuItem Header="Overview" Click="OverviewReport_Click"></MenuItem>
 					<MenuItem Header="Dependecies" Click=" DependecyReport_Click"></MenuItem>
 
 				</MenuItem>

src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs

@@ -45,9 +45,9 @@ public IReportCreator Run(ReadOnlyCollection<AssemblyNode> list)
 			Assembly asm = Assembly.GetExecutingAssembly();
 			System.IO.Stream stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.DependencyReport.srd");
 
-			var rf = new ReportingFactory();
-			var reportCreator = rf.ReportCreator (stream,newList);
-			ReportSettings = rf.ReportModel.ReportSettings;
+			var reportingFactory = new ReportingFactory();
+			var reportCreator = reportingFactory.ReportCreator (stream,newList);
+			ReportSettings = reportingFactory.ReportModel.ReportSettings;
 			reportCreator.BuildExportList();
 			return reportCreator;
 		}

src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs

@@ -23,6 +23,7 @@
 using System.Reflection;
 
 using ICSharpCode.NRefactory.Utils;
+using ICSharpCode.Reporting;
 using ICSharpCode.Reporting.Interfaces;
 using ICSharpCode.CodeQuality.Engine.Dom;
 
@@ -41,23 +42,36 @@ public  OverviewReport(List<string> fileNames):base(fileNames)
 
 		public IReportCreator Run(ReadOnlyCollection<AssemblyNode> list)
 		{
+			
+			var asm = Assembly.GetExecutingAssembly();
+			var stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.Overviewreport.srd");
+			
+			
+			var	 newList =  from c in list
+				select new OverviewViewModel { Node = c};
+			
+			var reportingFactory = new ReportingFactory();
+			var reportCreator = reportingFactory.ReportCreator (stream,newList);
+			ReportSettings = reportingFactory.ReportModel.ReportSettings;
+			var reportParameters = new ParameterCollection();
+			reportParameters.Add(new BasicParameter ("param1",base.FileNames[0]));
+			reportParameters.Add(new BasicParameter ("param2",list.Count.ToString()));
+			
+			ReportSettings.ParameterCollection.AddRange(reportParameters);
+			reportCreator.BuildExportList();
+			return reportCreator;
 			/*
-			System.Reflection.Assembly asm = Assembly.GetExecutingAssembly();
-			System.IO.Stream stream = asm.GetManifestResourceStream("ICSharpCode.CodeQuality.Reporting.Overviewreport.srd");
-			var model = ReportEngine.LoadReportModel(stream);
+var model = ReportEngine.LoadReportModel(stream);
 			ReportSettings = model.ReportSettings;
 			
-			var	 r =  from c in list
-				select new OverviewViewModel { Node = c};
+		
+			
 			
-			var p = new ReportParameters();
-			p.Parameters.Add(new BasicParameter ("param1",base.FileNames[0]));
-			p.Parameters.Add(new BasicParameter ("param2",list.Count.ToString()));
 			
 			IReportCreator creator = ReportEngine.CreatePageBuilder(model,r.ToList(),p);
 			creator.BuildExportList();
 			return creator;
-			*/
+			 */
 			return null;
 		}
 

src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd

@@ -15,15 +15,7 @@
             <AvailableFieldsCollection />
             <SortColumnsCollection />
             <GroupColumnsCollection />
-            <ParameterCollection>
-                <BasicParameter>
-                    <ParameterName>param1</ParameterName>
-                    <Type>System.String</Type>
-                </BasicParameter>
-                <BasicParameter>
-                    <ParameterName>param2</ParameterName>
-                </BasicParameter>
-            </ParameterCollection>
+            <ParameterCollection />
             <SqlParameters />
             <ConnectionString />
             <CommandText />
@@ -70,7 +62,7 @@
                     <CanGrow>False</CanGrow>
                     <CanShrink>False</CanShrink>
                     <RTL>No</RTL>
-                    <Text>=Today()</Text>
+                    <Text>=Today</Text>
                     <DrawBorder>False</DrawBorder>
                     <FrameColor>Black</FrameColor>
                     <ForeColor>ControlText</ForeColor>
@@ -100,7 +92,7 @@
                     <CanGrow>False</CanGrow>
                     <CanShrink>False</CanShrink>
                     <RTL>No</RTL>
-                    <Text>=Parameters!param2</Text>
+                    <Text>Parameters!param2</Text>
                     <DrawBorder>False</DrawBorder>
                     <FrameColor>Black</FrameColor>
                     <ForeColor>ControlText</ForeColor>
@@ -132,7 +124,7 @@
                     <CanGrow>False</CanGrow>
                     <CanShrink>False</CanShrink>
                     <RTL>No</RTL>
-                    <Text>=Parameters!param1</Text>
+                    <Text>Parameters!param1</Text>
                     <DrawBorder>False</DrawBorder>
                     <FrameColor>Black</FrameColor>
                     <ForeColor>ControlText</ForeColor>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/BasicParameter.cs

@@ -16,7 +16,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-namespace ICSharpCode.Reporting.BaseClasses
+namespace ICSharpCode.Reporting
 {
 	/// <summary>
 	/// Description of BasicParameter.

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs

@@ -30,9 +30,6 @@ namespace ICSharpCode.Reporting
 
 	public class SortColumnCollection: Collection<AbstractColumn>
 	{
-		public SortColumnCollection()
-		{
-		}
 
 		public AbstractColumn Find (string columnName)
 		{

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs

@@ -33,7 +33,7 @@ public class ReportSettings
 
 		public ReportSettings()
 		{
-			this.pageSize = Globals.GlobalValues.DefaultPageSize;
+			this.pageSize = GlobalValues.DefaultPageSize;
 			BaseValues();
 		}
 

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs

@@ -56,17 +56,13 @@ public IReportCreator ReportCreator (Stream stream,Type listType,IEnumerable lis
 		public IReportCreator ReportCreator (Stream stream)
 		{
 			ReportModel = LoadReportModel (stream);
-//			IReportCreator builder = null;
-//			builder = ReportCreatorFactory.ExporterFactory(ReportModel);
 			var builder = new FormPageBuilder(ReportModel);
 			return builder;
 		}
 
 
 		public IReportCreator ReportCreator (ReportModel reportModel) {
 			ReportModel = reportModel;
-//			IReportCreator builder = null;
-//			builder = ReportCreatorFactory.ExporterFactory(ReportModel);
 			var builder = new FormPageBuilder(ReportModel);
 			return builder;
 		}

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

@@ -110,6 +110,7 @@ private object ProcessNode(XmlNode node, object parent)
 
 		protected void ProcessChildProperties(XmlNode node, object parent)
 		{
+			
 			var t=parent.GetType();
 
 			// children of a class must always be properties