X-Git-Url: http://nitlanguage.org

diff --git a/src/metrics/inheritance_metrics.nit b/src/metrics/inheritance_metrics.nit
index 00d03f2..7638758 100644
--- a/src/metrics/inheritance_metrics.nit
+++ b/src/metrics/inheritance_metrics.nit
@@ -17,11 +17,9 @@
 # Collect metrics about inheritance usage
 module inheritance_metrics
 
-import model
+import metrics_base
 import mmodules_metrics
 import mclasses_metrics
-import phase
-import frontend
 
 redef class ToolContext
 	var inheritance_metrics_phase: Phase = new InheritanceMetricsPhase(self, null)
@@ -61,11 +59,11 @@ private class InheritanceMetricsPhase
 		var model = toolcontext.modelbuilder.model
 		var mmodules = new HashSet[MModule]
 		var mclasses = new HashSet[MClass]
-		for mproject in model.mprojects do
+		for mpackage in model.mpackages do
 
-			print toolcontext.format_h2("\n ## project {mproject}")
+			print toolcontext.format_h2("\n ## package {mpackage}")
 
-			for mgroup in mproject.mgroups do
+			for mgroup in mpackage.mgroups do
 				if mgroup.mmodules.is_empty then continue
 
 				# Scalar metrics
@@ -79,11 +77,11 @@ private class InheritanceMetricsPhase
 				cmetrics.clear
 				cmetrics.collect(new HashSet[MClass].from(mod_mclasses))
 				cmetrics.to_console(1, not toolcontext.opt_nocolors.value)
-				if csv then cmetrics.to_csv.save("{out}/{mgroup}_classes.csv")
+				if csv then cmetrics.to_csv.write_to_file("{out}/{mgroup}_classes.csv")
 				hmetrics.clear
 				hmetrics.collect(new HashSet[MModule].from(mgroup.mmodules))
 				hmetrics.to_console(1, not toolcontext.opt_nocolors.value)
-				if csv then hmetrics.to_csv.save("{out}/{mgroup}_inheritance.csv")
+				if csv then hmetrics.to_csv.write_to_file("{out}/{mgroup}_inheritance.csv")
 			end
 		end
 		if not mclasses.is_empty then
@@ -92,11 +90,11 @@ private class InheritanceMetricsPhase
 			cmetrics.clear
 			cmetrics.collect(mclasses)
 			cmetrics.to_console(1, not toolcontext.opt_nocolors.value)
-			if csv then cmetrics.to_csv.save("{out}/summary_classes.csv")
+			if csv then cmetrics.to_csv.write_to_file("{out}/summary_classes.csv")
 			hmetrics.clear
 			hmetrics.collect(mmodules)
 			hmetrics.to_console(1, not toolcontext.opt_nocolors.value)
-			if csv then hmetrics.to_csv.save("{out}/summary_inheritance.csv")
+			if csv then hmetrics.to_csv.write_to_file("{out}/summary_inheritance.csv")
 		end
 	end
 end