metrics: type phase attributes with Phase instead of private subclasses

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/metrics/ast_metrics.nit b/src/metrics/ast_metrics.nit
index df890d2..c1442c0 100644 (file)
--- a/src/metrics/ast_metrics.nit
+++ b/src/metrics/ast_metrics.nit
@@ -21,7 +21,7 @@ private import metrics_base
 import frontend
 
 redef class ToolContext
-       var ast_metrics_phase = new AstMetricsPhase(self, null)
+       var ast_metrics_phase: Phase = new AstMetricsPhase(self, null)
 end
 
 private class AstMetricsPhase

diff --git a/src/metrics/inheritance_metrics.nit b/src/metrics/inheritance_metrics.nit
index 6c95b58..2fc1d86 100644 (file)
--- a/src/metrics/inheritance_metrics.nit
+++ b/src/metrics/inheritance_metrics.nit
@@ -24,7 +24,7 @@ import phase
 import frontend
 
 redef class ToolContext
-       var inheritance_metrics_phase = new InheritanceMetricsPhase(self, null)
+       var inheritance_metrics_phase: Phase = new InheritanceMetricsPhase(self, null)
 end
 
 # Extract metrics about inheritance from model.

diff --git a/src/metrics/mclasses_metrics.nit b/src/metrics/mclasses_metrics.nit
index b2141a4..69af768 100644 (file)
--- a/src/metrics/mclasses_metrics.nit
+++ b/src/metrics/mclasses_metrics.nit
@@ -23,7 +23,7 @@ import phase
 import frontend
 
 redef class ToolContext
-       var mclasses_metrics_phase = new MClassesMetricsPhase(self, null)
+       var mclasses_metrics_phase: Phase = new MClassesMetricsPhase(self, null)
 end
 
 # Extract metrics about mclasses from model.

diff --git a/src/metrics/mendel_metrics.nit b/src/metrics/mendel_metrics.nit
index 814f8cb..65e104f 100644 (file)
--- a/src/metrics/mendel_metrics.nit
+++ b/src/metrics/mendel_metrics.nit
@@ -50,7 +50,7 @@ import phase
 import frontend
 
 redef class ToolContext
-       var mendel_metrics_phase = new MendelMetricsPhase(self, null)
+       var mendel_metrics_phase: Phase = new MendelMetricsPhase(self, null)
 end
 
 private class MendelMetricsPhase

diff --git a/src/metrics/mmodules_metrics.nit b/src/metrics/mmodules_metrics.nit
index c8ae98b..64812eb 100644 (file)
--- a/src/metrics/mmodules_metrics.nit
+++ b/src/metrics/mmodules_metrics.nit
@@ -23,7 +23,7 @@ import phase
 import frontend
 
 redef class ToolContext
-       var mmodules_metrics_phase = new MModulesMetricsPhase(self, null)
+       var mmodules_metrics_phase: Phase = new MModulesMetricsPhase(self, null)
 end
 
 # Extract metrics about modules from the model.

diff --git a/src/metrics/model_hyperdoc.nit b/src/metrics/model_hyperdoc.nit
index 3f29c64..6cffa50 100644 (file)
--- a/src/metrics/model_hyperdoc.nit
+++ b/src/metrics/model_hyperdoc.nit
@@ -23,7 +23,7 @@ import phase
 import frontend
 
 redef class ToolContext
-       var model_hyperdoc_phase = new ModelHyperdocPhase(self, null)
+       var model_hyperdoc_phase: Phase = new ModelHyperdocPhase(self, null)
 end
 
 private class ModelHyperdocPhase

diff --git a/src/metrics/nullables_metrics.nit b/src/metrics/nullables_metrics.nit
index 2ea642d..f3f5fe2 100644 (file)
--- a/src/metrics/nullables_metrics.nit
+++ b/src/metrics/nullables_metrics.nit
@@ -23,7 +23,7 @@ private import metrics_base
 import frontend
 
 redef class ToolContext
-       var nullables_metrics_phase = new NullablesMetricsPhase(self, null)
+       var nullables_metrics_phase: Phase = new NullablesMetricsPhase(self, null)
 end
 
 private class NullablesMetricsPhase

diff --git a/src/metrics/refinement_metrics.nit b/src/metrics/refinement_metrics.nit
index 6e876a7..2c9ac5a 100644 (file)
--- a/src/metrics/refinement_metrics.nit
+++ b/src/metrics/refinement_metrics.nit
@@ -22,7 +22,7 @@ private import metrics_base
 import frontend
 
 redef class ToolContext
-       var refinement_metrics_phase = new RefinementMetricsPhase(self, null)
+       var refinement_metrics_phase: Phase = new RefinementMetricsPhase(self, null)
 end
 
 private class RefinementMetricsPhase

diff --git a/src/metrics/rta_metrics.nit b/src/metrics/rta_metrics.nit
index 9c70740..7e31319 100644 (file)
--- a/src/metrics/rta_metrics.nit
+++ b/src/metrics/rta_metrics.nit
@@ -25,7 +25,7 @@ import mclasses_metrics
 import frontend
 
 redef class ToolContext
-       var rta_metrics_phase = new RTAMetricsPhase(self, null)
+       var rta_metrics_phase: Phase = new RTAMetricsPhase(self, null)
 end
 
 private class RTAMetricsPhase

diff --git a/src/metrics/self_metrics.nit b/src/metrics/self_metrics.nit
index e2f1172..12b2f64 100644 (file)
--- a/src/metrics/self_metrics.nit
+++ b/src/metrics/self_metrics.nit
@@ -21,7 +21,7 @@ private import metrics_base
 import frontend
 
 redef class ToolContext
-       var self_metrics_phase = new SelfMetricsPhase(self, null)
+       var self_metrics_phase: Phase = new SelfMetricsPhase(self, null)
 end
 
 private class SelfMetricsPhase

diff --git a/src/metrics/static_types_metrics.nit b/src/metrics/static_types_metrics.nit
index e4f983d..e0fb5c3 100644 (file)
--- a/src/metrics/static_types_metrics.nit
+++ b/src/metrics/static_types_metrics.nit
@@ -23,7 +23,7 @@ import modelize_class
 import frontend
 
 redef class ToolContext
-       var static_types_metrics_phase = new StaticTypesMetricsPhase(self, null)
+       var static_types_metrics_phase: Phase = new StaticTypesMetricsPhase(self, null)
 end
 
 private class StaticTypesMetricsPhase

diff --git a/src/metrics/tables_metrics.nit b/src/metrics/tables_metrics.nit
index 045e89f..42dae2a 100644 (file)
--- a/src/metrics/tables_metrics.nit
+++ b/src/metrics/tables_metrics.nit
@@ -22,7 +22,7 @@ private import metrics_base
 import frontend
 
 redef class ToolContext
-       var tables_metrics_phase = new TablesMetricsPhase(self, null)
+       var tables_metrics_phase: Phase = new TablesMetricsPhase(self, null)
 end
 
 private class TablesMetricsPhase