diff --git a/org.fortiss.tooling.ext.quality.ui/plugin.xml b/org.fortiss.tooling.ext.quality.ui/plugin.xml
index e8d5d353ab3b5a6bfb1eae75f0e0bc83c174e8d0..69b3dfdaf0b53c6c6f2bfef00d26c37b27a4a5c9 100644
--- a/org.fortiss.tooling.ext.quality.ui/plugin.xml
+++ b/org.fortiss.tooling.ext.quality.ui/plugin.xml
@@ -11,7 +11,7 @@
<extension
point="org.eclipse.ui.views">
<view
- class="org.fortiss.tooling.ext.quality.ui.view.fx.MetricsFXViewPart"
+ class="org.fortiss.tooling.ext.quality.ui.view.fx.ModelQualityFXViewPart"
icon="icons/library.png"
id="org.fortiss.tooling.ext.quality.ui.metricsView"
name="Metrics"
diff --git a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityExtractionMenu.java b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityExtractionMenu.java
index 1bb5f905673319ce1c9584109de967116df13f25..31ae65d7ec8e58c51ae3d88cf4cdb9630a579466 100644
--- a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityExtractionMenu.java
+++ b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityExtractionMenu.java
@@ -62,7 +62,7 @@ public class ModelQualityExtractionMenu implements IContextMenuContributor {
/** Returns the icon that is visible in the context menu for this entry. */
protected ImageDescriptor getActionIcon() {
- return QualityUIActivator.getImageDescriptor("icons/componentarchitecture.gif");
+ return ModelQualityUIActivator.getImageDescriptor("icons/componentarchitecture.gif");
}
/** Action for generating the set of . */
diff --git a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/QualityUIActivator.java b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityUIActivator.java
similarity index 79%
rename from org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/QualityUIActivator.java
rename to org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityUIActivator.java
index ecf17f2329ec9811f2bd5795874f913fa189a281..0248951db8088ebb9f736e902d78fb3c4413b909 100644
--- a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/QualityUIActivator.java
+++ b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/ModelQualityUIActivator.java
@@ -10,13 +10,13 @@ import org.osgi.framework.BundleContext;
* @author blaschke
*
*/
-public class QualityUIActivator extends Plugin {
+public class ModelQualityUIActivator extends Plugin {
/** The plug-in ID. */
- public static final String PLUGIN_ID = QualityUIActivator.class.getPackage().getName(); // $NON-NLS-1$
+ public static final String PLUGIN_ID = ModelQualityUIActivator.class.getPackage().getName(); // $NON-NLS-1$
/** The shared instance. */
- private static QualityUIActivator plugin;
+ private static ModelQualityUIActivator plugin;
/** {@inheritDoc} */
@Override
@@ -37,7 +37,7 @@ public class QualityUIActivator extends Plugin {
*
* @return The shared instance of ToolingReuseActivator
*/
- public static QualityUIActivator getDefault() {
+ public static ModelQualityUIActivator getDefault() {
return plugin;
}
diff --git a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/IMetricsViewPart.java b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/IModelQualityViewPart.java
similarity index 97%
rename from org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/IMetricsViewPart.java
rename to org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/IModelQualityViewPart.java
index 058875fa6d7f04ce4e2fcd40c4d5e5927cdca312..c8fc7399e7fec75bb4b144630bbc2ad6ed633e29 100644
--- a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/IMetricsViewPart.java
+++ b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/IModelQualityViewPart.java
@@ -20,7 +20,7 @@ package org.fortiss.tooling.ext.quality.ui.view.fx;
*
* @author groh
*/
-public interface IMetricsViewPart {
+public interface IModelQualityViewPart {
/** View ID for reuse library views. */
// Keep in sync with plugin.xml
diff --git a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/MetricsFXController.java b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/ModelQualityFXController.java
similarity index 99%
rename from org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/MetricsFXController.java
rename to org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/ModelQualityFXController.java
index 5e5699f3e4df1aee60b3d5fd5edc965a77fd0621..d4a924e43f08ed30b77c8a202cf590d0bee9f69b 100644
--- a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/MetricsFXController.java
+++ b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/ModelQualityFXController.java
@@ -69,7 +69,7 @@ import javafx.scene.layout.BorderPane;
*/
@SuppressWarnings("unchecked")
-public class MetricsFXController extends CompositeFXControllerBase<SplitPane, Node>
+public class ModelQualityFXController extends CompositeFXControllerBase<SplitPane, Node>
implements ISelectionListener {
/** The {@link IProjectRootElement} in which the selected element is contained in. */
diff --git a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/MetricsFXViewPart.java b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/ModelQualityFXViewPart.java
similarity index 83%
rename from org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/MetricsFXViewPart.java
rename to org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/ModelQualityFXViewPart.java
index 470c3736e7d8de6b49f44426cba76df32116cff1..182cd2459c5711396acb76386b75b20d235745cb 100644
--- a/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/MetricsFXViewPart.java
+++ b/org.fortiss.tooling.ext.quality.ui/src/org/fortiss/tooling/ext/quality/ui/view/fx/ModelQualityFXViewPart.java
@@ -25,27 +25,27 @@ import javafx.scene.Scene;
*
* @author groh
*/
-public class MetricsFXViewPart extends AF3FXViewPart implements IMetricsViewPart {
+public class ModelQualityFXViewPart extends AF3FXViewPart implements IModelQualityViewPart {
/** The FX Controller for this view. */
- private static final MetricsFXController VIEW_CONTROLLER = new MetricsFXController();
+ private static final ModelQualityFXController VIEW_CONTROLLER = new ModelQualityFXController();
/**
* Constructor.
*
* @throws Exception
*/
- public MetricsFXViewPart() throws Exception {
+ public ModelQualityFXViewPart() throws Exception {
super(VIEW_CONTROLLER, null);
}
/**
- * Returns the initialized {@link MetricsFXController} for the reuse
+ * Returns the initialized {@link ModelQualityFXController} for the reuse
* version of the {@link AF3FXViewPart}.
*
* @return The view controller for the metrics view
*/
- public static MetricsFXController getMetricsFXController() {
+ public static ModelQualityFXController getMetricsFXController() {
return VIEW_CONTROLLER;
}
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 7ebd78175657b23e7e23999ed6bfddf536d1236d..7008b8eb302008e729a6433ec6fbfc065d3008e9 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
@@ -29,13 +29,13 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement;
import org.fortiss.tooling.kernel.utils.EcoreUtils;
/**
- * {@link IModelQualityProvider} to count the ratio of filled out comments of
+ * {@link IMetricProvider} to count the ratio of filled out comments of
* INamedCommentedElements.
*
* @author blaschke
* @author groh
*/
-public class HierarchicElementProvider implements IModelQualityProvider<IHierarchicElement> {
+public class HierarchicElementProvider implements IMetricProvider<IHierarchicElement> {
/**
* returns an array of integers or <String,Double> Map Number of children of the
* hierarchical Element (on this level) Number of ports on the hierarchical
diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IModelQualityProvider.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java
similarity index 95%
rename from org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IModelQualityProvider.java
rename to org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java
index 15cc41a2988c45c171e2d23608613135312ed780..01f3d4d7db0267f458eed2bbab50fd315906e7a6 100644
--- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IModelQualityProvider.java
+++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/IMetricProvider.java
@@ -28,7 +28,7 @@ import org.fortiss.tooling.kernel.service.base.IEObjectAware;
*
* @author blaschke
*/
-public interface IModelQualityProvider<C extends EObject> extends IEObjectAware<EObject> {
+public interface IMetricProvider<C extends EObject> extends IEObjectAware<EObject> {
/** Applies the IMetricProvider to the given model element. */
void apply(MetricDataManager manager, MetricTreeNode node, C element);
diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/data/MetricTreeNode.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/data/MetricTreeNode.java
index 96f7044720798fc16eb60912c11a621be4998f3c..f23119d07f1bc36a0b5e2d7bd2228f56d64be18c 100644
--- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/data/MetricTreeNode.java
+++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/data/MetricTreeNode.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
-import org.fortiss.tooling.ext.quality.IModelQualityProvider;
+import org.fortiss.tooling.ext.quality.IMetricProvider;
/**
* A general class for storing all kinds of metric data in a hierarchical tree structure.
@@ -36,16 +36,16 @@ public class MetricTreeNode {
private List<MetricTreeNode> children;
/**
- * This map stores a relationship between a {@link IModelQualityProvider} and
+ * This map stores a relationship between a {@link IMetricProvider} and
* {@link IMetricDataContainer}.
*
- * This allows all {@linkplain IModelQualityProvider} to deposit data inside this structure, and
+ * This allows all {@linkplain IMetricProvider} to deposit data inside this structure, and
* quickly retrieve it for processing
*
* The stored data can then also be accessed by other methods, for displaying information,
* creating statistics, etc.
*/
- private Map<Class<? extends IModelQualityProvider<?>>, IMetricDataContainer> dataContainers;
+ private Map<Class<? extends IMetricProvider<?>>, IMetricDataContainer> dataContainers;
/** Map containing all metrics which are a double */
private Map<MetricKey, Double> storedMetrics;
@@ -74,7 +74,7 @@ public class MetricTreeNode {
*
* @return the map storing all DataContainers in this node
*/
- public Map<Class<? extends IModelQualityProvider<?>>, IMetricDataContainer>
+ public Map<Class<? extends IMetricProvider<?>>, IMetricDataContainer>
getDataContainers() {
return dataContainers;
}
diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/IModelQualityService.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/IModelQualityService.java
index 848aa951ca852a0eff3b0f7f1a0eeabb0c29f063..5400dc318ea6ef76098b9cb74dd92a00a068dd17 100644
--- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/IModelQualityService.java
+++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/IModelQualityService.java
@@ -15,7 +15,7 @@
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.ext.quality.service;
-import org.fortiss.tooling.ext.quality.IModelQualityProvider;
+import org.fortiss.tooling.ext.quality.IMetricProvider;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
/**
@@ -30,7 +30,7 @@ public interface IModelQualityService {
}
/** Registers the metric provider with the service. */
- void registerMetricProvider(IModelQualityProvider<?> provider, Class<?> modelElementClass);
+ void registerMetricProvider(IMetricProvider<?> provider, Class<?> modelElementClass);
/** analyses the metrics and processes them */
void performMetricAnalysis(ITopLevelElement top);
diff --git a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/ModelQualityService.java b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/ModelQualityService.java
index ee7b9188b966fb21928668f467cb5bed7ddaee6a..f02363a748de111b836f9f33b20fede703547bd4 100644
--- a/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/ModelQualityService.java
+++ b/org.fortiss.tooling.ext.quality/src/org/fortiss/tooling/ext/quality/service/ModelQualityService.java
@@ -40,7 +40,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.ext.quality.HierarchicElementProvider;
-import org.fortiss.tooling.ext.quality.IModelQualityProvider;
+import org.fortiss.tooling.ext.quality.IMetricProvider;
import org.fortiss.tooling.ext.quality.data.MetricDataManager;
import org.fortiss.tooling.ext.quality.data.MetricKey;
import org.fortiss.tooling.ext.quality.data.MetricTreeNode;
@@ -59,7 +59,7 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
*
* @author blaschke
*/
-public class ModelQualityService extends EObjectAwareServiceBase<IModelQualityProvider<?>>
+public class ModelQualityService extends EObjectAwareServiceBase<IMetricProvider<?>>
implements IIntrospectiveKernelService, IModelQualityService {
/** The singleton instance. */
@@ -91,7 +91,7 @@ public class ModelQualityService extends EObjectAwareServiceBase<IModelQualityPr
/** Registers the migration provider with the service. */
@Override
- public void registerMetricProvider(IModelQualityProvider<?> provider,
+ public void registerMetricProvider(IMetricProvider<?> provider,
Class<?> modelElementClass) {
addHandler(modelElementClass, provider);
}
@@ -106,10 +106,10 @@ public class ModelQualityService extends EObjectAwareServiceBase<IModelQualityPr
"\n\nThe service extension point is '" + EXTENSION_POINT_NAME + "'.";
}
- /** Get all suitable {@link IModelQualityProvider} for the given input. */
- protected List<IModelQualityProvider<?>> getAllMetricProviders(EObject input) {
- List<IModelQualityProvider<?>> providers = new ArrayList<>();
- for(Entry<Class<?>, List<IModelQualityProvider<?>>> migEntry : handlerMap.entrySet()) {
+ /** Get all suitable {@link IMetricProvider} for the given input. */
+ protected List<IMetricProvider<?>> getAllMetricProviders(EObject input) {
+ List<IMetricProvider<?>> providers = new ArrayList<>();
+ for(Entry<Class<?>, List<IMetricProvider<?>>> migEntry : handlerMap.entrySet()) {
if(getFirstChildWithType(input, migEntry.getKey()) != null) {
providers.addAll(migEntry.getValue());
}