nitmetrics: use model filters

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/src/metrics/codesmells_metrics.nit b/src/metrics/codesmells_metrics.nit
index 7e9b8d3..cd98e85 100644 (file)
--- a/src/metrics/codesmells_metrics.nit
+++ b/src/metrics/codesmells_metrics.nit
@@ -34,7 +34,8 @@ class CodeSmellsMetricsPhase
        redef fun process_mainmodule(mainmodule, given_mmodules) do
                print toolcontext.format_h1("--- Code Smells Metrics ---")
 
-               var view = new ModelView(toolcontext.modelbuilder.model, mainmodule)
+               var filter = new ModelFilter(private_visibility)
+               var view = new ModelView(toolcontext.modelbuilder.model, mainmodule, filter)
                self.set_all_average_metrics(view)
                var mclass_codesmell = new BadConceptonController(view)
                var collect = new Counter[MClassDef]

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index 2f8b9ef..158a448 100644 (file)
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -37,7 +37,8 @@ private class MClassesMetricsPhase
                out.mkdir
 
                var model = toolcontext.modelbuilder.model
-               var model_view = new ModelView(model, mainmodule)
+               var filter = new ModelFilter(private_visibility)
+               var model_view = new ModelView(model, mainmodule, filter)
 
                print toolcontext.format_h1("\n# MClasses metrics")
 

diff --git a/src/metrics/mendel_metrics.nit b/src/metrics/mendel_metrics.nit
index 42b20ad..e16e75f 100644 (file)
--- a/src/metrics/mendel_metrics.nit
+++ b/src/metrics/mendel_metrics.nit
@@ -67,8 +67,8 @@ private class MendelMetricsPhase
                print toolcontext.format_h1("\n# Mendel metrics")
 
                var model = toolcontext.modelbuilder.model
-               var model_view = new ModelView(model, mainmodule)
-               model_view.min_visibility = protected_visibility
+               var filter = new ModelFilter(min_visibility = protected_visibility)
+               var model_view = new ModelView(model, mainmodule, filter)
 
                var mclasses = new HashSet[MClass]
                for mclass in model_view.mclasses do

diff --git a/src/metrics/nullables_metrics.nit b/src/metrics/nullables_metrics.nit
index 81c4e52..a7634f1 100644 (file)
--- a/src/metrics/nullables_metrics.nit
+++ b/src/metrics/nullables_metrics.nit
@@ -40,7 +40,8 @@ private class NullablesMetricsPhase
                print toolcontext.format_h1("\n# Nullable metrics")
 
                var model = toolcontext.modelbuilder.model
-               var model_view = new ModelView(model, mainmodule)
+               var filter = new ModelFilter(private_visibility)
+               var model_view = new ModelView(model, mainmodule, filter)
 
                var metrics = new MetricSet
                metrics.register(new CNBA(model_view))

diff --git a/src/metrics/rta_metrics.nit b/src/metrics/rta_metrics.nit
index ef11924..94a4dca 100644 (file)
--- a/src/metrics/rta_metrics.nit
+++ b/src/metrics/rta_metrics.nit
@@ -38,8 +38,8 @@ private class RTAMetricsPhase
                out.mkdir
 
                var model = toolcontext.modelbuilder.model
-               var model_view = new ModelView(model, mainmodule)
-               model_view.min_visibility = protected_visibility
+               var filter = new ModelFilter(min_visibility = protected_visibility)
+               var model_view = new ModelView(model, mainmodule, filter)
 
                print toolcontext.format_h1("\n# RTA metrics")