From d9521390bf65b6da8f5aca4fa468e4b7400d62f7 Mon Sep 17 00:00:00 2001 From: PeterForstmeier Date: Sun, 26 Feb 2012 18:18:28 +0100 Subject: [PATCH] ReportViewModel.cs DependencyReport --- .../Analysis/CodeQuality/CodeQuality.csproj | 3 +- .../CodeQuality/Reporting/DependencyReport.cs | 42 ++++++++--------- .../Reporting/DependencyReport.srd | 47 ++++++++++++++++--- .../CodeQuality/Reporting/OverviewReport.cs | 30 +++++------- ...portingOverview.srd => Overviewreport.srd} | 2 +- .../CodeQuality/Reporting/ReportViewModel.cs | 33 +++++++++++++ 6 files changed, 110 insertions(+), 47 deletions(-) rename src/AddIns/Analysis/CodeQuality/Reporting/{ReportingOverview.srd => Overviewreport.srd} (99%) create mode 100644 src/AddIns/Analysis/CodeQuality/Reporting/ReportViewModel.cs diff --git a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj index dfa9dcf52d..2cbb3b8132 100644 --- a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj +++ b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj @@ -94,6 +94,7 @@ + @@ -106,7 +107,7 @@ Always - + Always diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs index ec3e1c8df8..b4b1cbba16 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs +++ b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs @@ -21,6 +21,7 @@ namespace ICSharpCode.CodeQuality.Reporting public class DependencyReport:BaseReport { private const string overviewReport = "DependencyReport.srd"; + public DependencyReport(List fileNames):base(fileNames) { } @@ -37,19 +38,25 @@ namespace ICSharpCode.CodeQuality.Reporting return creator; } - List MakeList (ReadOnlyCollection list) + + private List MakeList (ReadOnlyCollection list) { - AssemblyNode baseNode = list[0]; var newList = new List(); - foreach (var element in list) { - var i = baseNode.GetUses(element); - if (i > 0) { - Console.WriteLine("{0} ref {1} times {2}",baseNode.Name,element.Name,i); - newList.Add(new DependencyViewModel() - { - Node = baseNode, - References = element.Name - }); + foreach (var baseNode in list) { + foreach (var element in list) { + if (baseNode.Name != element.Name) { + + + var referenceCount = baseNode.GetUses(element); + if (referenceCount > 0) { + newList.Add(new DependencyViewModel() + { + Node = baseNode, + References = element.Name, + ReferenceCount = referenceCount + }); + } + } } } return newList; @@ -57,22 +64,15 @@ namespace ICSharpCode.CodeQuality.Reporting } - internal class DependencyViewModel + internal class DependencyViewModel:ReportViewModel { public DependencyViewModel() { } - public AssemblyNode Node {get;set;} - - - public string Name - { - get {return Node.Name;} - } - public string References {get;set;} - } + public int ReferenceCount {get;set;} + } } diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd index ab19d8a7e4..f48751f89d 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd +++ b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd @@ -147,6 +147,24 @@ Black Black + + 443, 4 + 71, 20 + White + True + Segoe UI, 9pt + None + MiddleRight + False + False + No + BaseDataItem2147483646 + False + Black + Black + ReferenceCount + BaseDataItem2147483646 + 254, 4 156, 20 @@ -179,6 +197,23 @@ Black Black + + 414, 7 + 100, 20 + White + True + Segoe UI, 9.75pt + None + MiddleRight + False + False + No + # of References + False + Black + Black + BaseTextItem2147483646 + 254, 2 100, 20 @@ -226,7 +261,7 @@ 50, 339 - 727, 60 + 727, 36 White False 0 @@ -236,7 +271,7 @@ 31, 5 - 573, 20 + 555, 20 White True Segoe UI, 9.75pt @@ -245,14 +280,14 @@ False False No - = Globals!ReportFolder + '\' + Globals!ReportName + = Globals!ReportFolder + Globals!ReportName False Black ControlText BaseTextItem2147483641 - 622, 5 + 624, 5 100, 20 White True @@ -263,7 +298,7 @@ False System.String No - =Globals!PageNumber + = 'Page : ' + Globals!PageNumber False Black Black @@ -274,7 +309,7 @@ ReportPageFooter - 50, 414 + 50, 390 727, 60 White False diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs b/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs index fdce388624..3f39349c1e 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs +++ b/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs @@ -9,11 +9,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.IO; using System.Linq; -using System.Reflection; + using ICSharpCode.CodeQuality.Engine.Dom; -using ICSharpCode.CodeQuality.Reporting; using ICSharpCode.NRefactory.Utils; using ICSharpCode.Reports.Core; @@ -24,7 +22,7 @@ namespace ICSharpCode.CodeQuality.Reporting /// public class OverviewReport:BaseReport { - private const string overviewReport = "ReportingOverview.srd"; + private const string overviewReport = "OverviewReport.srd"; public OverviewReport(List fileNames):base(fileNames) { @@ -51,30 +49,23 @@ namespace ICSharpCode.CodeQuality.Reporting } - internal class OverviewViewModel + internal class OverviewViewModel:ReportViewModel { public OverviewViewModel () { } - public AssemblyNode Node {get;set;} - - public string Name - { - get {return Node.Name;} - } public int ChildCount { - get { - - return Node.Children.Count;} + get {return Node.Children.Count;} } public int MethodCount { - get { + get + { return TreeTraversal.PreOrder((NodeBase)Node, n => n.Children).OfType().Count(); } } @@ -82,7 +73,8 @@ namespace ICSharpCode.CodeQuality.Reporting public int PropertyCount { - get { + get + { return TreeTraversal.PreOrder((NodeBase)Node, n => n.Children).OfType().Count(); } } @@ -90,7 +82,8 @@ namespace ICSharpCode.CodeQuality.Reporting public int EventCount { - get { + get + { return TreeTraversal.PreOrder((NodeBase)Node, n => n.Children).OfType().Count(); } } @@ -98,7 +91,8 @@ namespace ICSharpCode.CodeQuality.Reporting public int TypesCount { - get { + get + { return TreeTraversal.PreOrder((NodeBase)Node, n => n.Children).OfType().Count(); } } diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/ReportingOverview.srd b/src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd similarity index 99% rename from src/AddIns/Analysis/CodeQuality/Reporting/ReportingOverview.srd rename to src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd index b7f119e734..47025247ea 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/ReportingOverview.srd +++ b/src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd @@ -473,7 +473,7 @@ False False No - = Globals!ReportFolder + '\' + Globals!ReportName + = Globals!ReportFolder + Globals!ReportName False Black ControlText diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/ReportViewModel.cs b/src/AddIns/Analysis/CodeQuality/Reporting/ReportViewModel.cs new file mode 100644 index 0000000000..3546c5de1a --- /dev/null +++ b/src/AddIns/Analysis/CodeQuality/Reporting/ReportViewModel.cs @@ -0,0 +1,33 @@ +/* + * Created by SharpDevelop. + * User: Peter Forstmeier + * Date: 26.02.2012 + * Time: 18:10 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +using System; +using ICSharpCode.CodeQuality.Engine.Dom; + +namespace ICSharpCode.CodeQuality.Reporting +{ + /// + /// Description of ReportViewModel. + /// + internal class ReportViewModel + { + public ReportViewModel() + { + } + + public AssemblyNode Node {get;set;} + + + public string Name + { + get {return Node.Name;} + } + + + } +}