diff --git a/src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml b/src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml index cee5e2c365..dc85edf1f5 100644 --- a/src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml +++ b/src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml @@ -12,7 +12,7 @@ - + diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs index ebfd02ac57..0209803fd4 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs +++ b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.cs @@ -45,9 +45,9 @@ namespace ICSharpCode.CodeQuality.Reporting 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; } diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs b/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs index f9d487da9a..02127780ab 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs +++ b/src/AddIns/Analysis/CodeQuality/Reporting/OverviewReport.cs @@ -23,6 +23,7 @@ using System.Linq; using System.Reflection; using ICSharpCode.NRefactory.Utils; +using ICSharpCode.Reporting; using ICSharpCode.Reporting.Interfaces; using ICSharpCode.CodeQuality.Engine.Dom; @@ -41,23 +42,36 @@ namespace ICSharpCode.CodeQuality.Reporting public IReportCreator Run(ReadOnlyCollection 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; } diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd b/src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd index cc0d738962..6d00064806 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd +++ b/src/AddIns/Analysis/CodeQuality/Reporting/Overviewreport.srd @@ -15,15 +15,7 @@ - - - param1 - System.String - - - param2 - - + @@ -70,7 +62,7 @@ False False No - =Today() + =Today False Black ControlText @@ -100,7 +92,7 @@ False False No - =Parameters!param2 + Parameters!param2 False Black ControlText @@ -132,7 +124,7 @@ False False No - =Parameters!param1 + Parameters!param1 False Black ControlText diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/BasicParameter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/BasicParameter.cs index d3d490aa98..08ac722859 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/BaseClasses/BasicParameter.cs +++ b/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 { /// /// Description of BasicParameter. diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs index 33f6f54792..5bc4688209 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs @@ -30,9 +30,6 @@ namespace ICSharpCode.Reporting public class SortColumnCollection: Collection { - public SortColumnCollection() - { - } public AbstractColumn Find (string columnName) { diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs index 0718cf666d..5cde4defba 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs @@ -33,7 +33,7 @@ namespace ICSharpCode.Reporting.Items public ReportSettings() { - this.pageSize = Globals.GlobalValues.DefaultPageSize; + this.pageSize = GlobalValues.DefaultPageSize; BaseValues(); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs index c1f590e9bd..588a8801fb 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs @@ -56,8 +56,6 @@ namespace ICSharpCode.Reporting public IReportCreator ReportCreator (Stream stream) { ReportModel = LoadReportModel (stream); -// IReportCreator builder = null; -// builder = ReportCreatorFactory.ExporterFactory(ReportModel); var builder = new FormPageBuilder(ReportModel); return builder; } @@ -65,8 +63,6 @@ namespace ICSharpCode.Reporting public IReportCreator ReportCreator (ReportModel reportModel) { ReportModel = reportModel; -// IReportCreator builder = null; -// builder = ReportCreatorFactory.ExporterFactory(ReportModel); var builder = new FormPageBuilder(ReportModel); return builder; } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs index f3099e567e..53683ca84b 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs @@ -110,6 +110,7 @@ namespace ICSharpCode.Reporting.Xml protected void ProcessChildProperties(XmlNode node, object parent) { + var t=parent.GetType(); // children of a class must always be properties