| commit | b1f8eef043ae7bf402345fcd0418d3c4c24d90b4 | [log] [tgz] |
|---|---|---|
| author | tarendt <tarendt> | Thu Feb 27 22:20:25 2014 +0100 |
| committer | tarendt <tarendt> | Thu Feb 27 22:20:25 2014 +0100 |
| tree | 1f49d4c3e492858be98899af36a41274599f86c7 | |
| parent | cc6929e1dca66f5adb4dc39dc4de78ff4550bc6e [diff] |
bugs fixed
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml b/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml index 71e1394..336f105 100644 --- a/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml +++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml
@@ -7,9 +7,9 @@ id="org.eclipse.emf.refactor.metrics.uml24.qacp" metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.QACP" metric_context="Package" - metric_description="Quota of abstract classes within the package" + metric_description="Quota of abstract classes within the package (Abstractness)" metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML" - metric_name="QACP"> + metric_name="A"> </metric> </extension> <extension
diff --git a/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.class b/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.class index b072eb5..2cd75a0 100644 --- a/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.class +++ b/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.class Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.java b/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.java index 65e784b..475162a 100644 --- a/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.java +++ b/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlcl/NEATC.java
@@ -85,7 +85,8 @@ private EList<Class> getOtherClassses(Class cl) { EList<Class> otherClasses = new BasicEList<Class>(); - TreeIterator<EObject> iter = context.get(0).eResource().getAllContents(); +// TreeIterator<EObject> iter = context.get(0).eResource().getAllContents(); + TreeIterator<EObject> iter = getRoot(context.get(0)).eAllContents(); while (iter.hasNext()) { EObject eObject = iter.next(); if (eObject instanceof Class) { @@ -97,4 +98,9 @@ } return otherClasses; } + + private EObject getRoot(EObject eObject) { + if (eObject.eContainer() == null) return eObject; + else return getRoot(eObject.eContainer()); + } } \ No newline at end of file