Merge: doc: fixed some typos and other misc. corrections

[nit.git] / src / metrics / nullables_metrics.nit

diff --git a/src/metrics/nullables_metrics.nit b/src/metrics/nullables_metrics.nit
index 81c4e52..0cae25d 100644 (file)
--- a/src/metrics/nullables_metrics.nit
+++ b/src/metrics/nullables_metrics.nit
@@ -40,11 +40,11 @@ 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 metrics = new MetricSet
-               metrics.register(new CNBA(model_view))
-               metrics.register(new CNBNA(model_view))
+               metrics.register(new CNBA(model, mainmodule, filter))
+               metrics.register(new CNBNA(model, mainmodule, filter))
 
                var mclasses = new HashSet[MClass]
                for mpackage in model.mpackages do
@@ -88,7 +88,7 @@ class CNBNA
 
        redef fun collect(mclasses) do
                for mclass in mclasses do
-                       var all = mclass.collect_accessible_mattributes(model_view)
+                       var all = mclass.collect_accessible_mattributes(mainmodule, filter)
                        for mattr in all do
                                if mattr.is_nullable then values.inc(mclass)
                        end