diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/.ratings b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/.ratings index f6e9401788f9e99fa41f012dd5f423e442c0b15c..839f38ab6dd6a132cc53fd8c63324f57d7ac44aa 100644 --- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/.ratings +++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/.ratings @@ -1,4 +1,4 @@ AF3QualityActivator.java 353c3d99f423997e4e99a896b3c095fd77d81431 YELLOW GraphMetricsProvider.java 2d3fff61af2537bc5b10b3c210dc8e4b3ad49c1d YELLOW HierarchicElementProvider.java 3c114abd47ecc0d7da751c3f05c83fd49a30717b YELLOW -IMetricProvider.java 5e3d0debc0f81ed4e6c7dbc0f8d0e55df1bfde39 YELLOW +IMetricProvider.java 99fc8993b0e65b2f8757978eeb0481d912f5608c YELLOW diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/GraphMetricsProvider.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/GraphMetricsProvider.java index 2d3fff61af2537bc5b10b3c210dc8e4b3ad49c1d..7077c433487a417030642099dd0b6bf53a9a0c17 100644 --- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/GraphMetricsProvider.java +++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/GraphMetricsProvider.java @@ -310,12 +310,18 @@ public class GraphMetricsProvider { } } // Save metric - MetricKey key = recursively ? MetricKey.BETWEENESS_CENTRALITY_RECURSIVELY - : MetricKey.BETWEENESS_CENTRALITY; - for(IHierarchicElement child : scopeElement.getContainedElements()) { - manager.getTreeNodeLookupTable().get(child).getStoredDoubles().put(key, - betweenness.get(child)); - } + saveMetric(scopeElement, manager, recursively, betweenness); + } + } + + /** Saving the metrics for each contained element of an {@link IHierarchicElement}. */ + private static void saveMetric(IHierarchicElement scopeElement, MetricDataManager manager, boolean recursively, + Map<IHierarchicElement, Double> betweenness) { + MetricKey key = recursively ? MetricKey.BETWEENESS_CENTRALITY_RECURSIVELY + : MetricKey.BETWEENESS_CENTRALITY; + for(IHierarchicElement child : scopeElement.getContainedElements()) { + manager.getTreeNodeLookupTable().get(child).getStoredDoubles().put(key, + betweenness.get(child)); } } } diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/HierarchicElementProvider.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/HierarchicElementProvider.java index 3c114abd47ecc0d7da751c3f05c83fd49a30717b..721c03e40f618955867e662a46e55b4b6a8cd7bc 100644 --- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/HierarchicElementProvider.java +++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/HierarchicElementProvider.java @@ -27,7 +27,6 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils; /** * {@link IMetricProvider} to collect various metrics from an {@link IHierarchicElement}. * - * @author blaschke * @author groh */ public class HierarchicElementProvider implements IMetricProvider<IHierarchicElement> { diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java index 5e3d0debc0f81ed4e6c7dbc0f8d0e55df1bfde39..99fc8993b0e65b2f8757978eeb0481d912f5608c 100644 --- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java +++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java @@ -22,7 +22,6 @@ import org.fortiss.tooling.kernel.service.base.IEObjectAware; /** * Interface for all metric providers. - * <P> * They are called by {@link IModelQualityService} to collect metrics on model elements. * * @author blaschke