bug fixed
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF
index 678e566..aeef19f 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF
@@ -7,9 +7,6 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.8.1",
- org.eclipse.emf.refactor.metrics;bundle-version="0.7.0",
- org.eclipse.emf.refactor.metrics.ecore;bundle-version="0.7.0",
- org.eclipse.emf.refactor.metrics.ecore.ocl;bundle-version="0.7.0",
- org.eclipse.emf.refactor.metrics.ecore.henshin;bundle-version="0.7.0"
+ org.eclipse.emf.refactor.metrics;bundle-version="0.7.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.class b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/AvEPEOEC.class
similarity index 94%
rename from org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/AvEPEOEC.class
index 6473941..3b291fb 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/AvEPEOEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.class b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/NFEEC.class
similarity index 94%
rename from org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/NFEEC.class
index 34a1578..d466f63 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/NFEEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml
index 878db6c..882b13c 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.emf.refactor.metrics">
<metric
id="org.eclipse.emf.refactor.metrics.ecore.avepeoec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.compositional.eclass.AvEPEOEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.compositional.eclazz.AvEPEOEC"
metric_context="EClass"
metric_description="Average number of EParameters in EOperations of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -13,7 +13,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nfeec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.compositional.eclass.NFEEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.compositional.eclazz.NFEEC"
metric_context="EClass"
metric_description="Number of features (EAttributes and EOperations) of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.java b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/AvEPEOEC.java
similarity index 99%
rename from org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/AvEPEOEC.java
index 4e109d3..63b1adb 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/AvEPEOEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.compositional.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.compositional.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.java b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/NFEEC.java
similarity index 99%
rename from org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/NFEEC.java
index 6774d39..9bb96c7 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclazz/NFEEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.compositional.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.compositional.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF
index ea385ee..633d75f 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Activator: org.eclipse.emf.refactor.metrics.ecore.henshin.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.8.1",
- org.eclipse.emf.refactor.metrics;bundle-version="0.7.0",
- org.eclipse.emf.refactor.metrics.henshin;bundle-version="0.7.0"
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.refactor.metrics,
+ org.eclipse.emf.refactor.metrics.henshin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEOEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEOEC.class
new file mode 100644
index 0000000..44fa572
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEOEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEPEC.class
new file mode 100644
index 0000000..feeedbf
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEREC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEREC.class
new file mode 100644
index 0000000..c616783
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEREC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEC.class
new file mode 100644
index 0000000..aa8929b
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPECEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPECEC.class
new file mode 100644
index 0000000..c7bcdea
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPECEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEIEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEIEC.class
new file mode 100644
index 0000000..eceb750
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEIEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC.class
new file mode 100644
index 0000000..79fd6f0
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC2.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC2.class
new file mode 100644
index 0000000..c3889cf
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC2.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml
index 3e4b43a..0b2a652 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.emf.refactor.metrics">
<metric
id="org.eclipse.emf.refactor.metrics.ecore.eceoec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ECEOEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.ECEOEC"
metric_context="EClass"
metric_description="Number of EReferences of other EClasses having the given EClass as type."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -13,7 +13,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.ecerec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ECEREC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.ECEREC"
metric_context="EClass"
metric_description="Number of EReferences of other EClasses having the given EClass as type."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -21,7 +21,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.ecepec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ECEPEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.ECEPEC"
metric_context="EClass"
metric_description="Number of EParameters within other EClasses having the given EClass as type."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -29,7 +29,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.icepeiec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ICEPEIEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.ICEPEIEC"
metric_context="EClass"
metric_description="Number of EParameters within the EClass having another interface as type."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -37,7 +37,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.icepecec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ICEPECEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.ICEPECEC"
metric_context="EClass"
metric_description="Number of EParameters within the EClass having another EClass as type."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -45,7 +45,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.icepec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ICEPEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.ICEPEC"
metric_context="EClass"
metric_description="Number of EParameters within the EClass having another EClass or interface as type."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -53,7 +53,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nsubec2"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.NSUBEC2"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.NSUBEC2"
metric_context="EClass"
metric_description="Number of all child EClasses of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -61,7 +61,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nsubec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.NSUBEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz.NSUBEC"
metric_context="EClass"
metric_description="Number of direct child EClasses of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEOEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEOEC.java
index f5cce84..5853430 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEOEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -30,7 +29,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEPEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEPEC.java
index 3b0836a..e799a2c 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -31,7 +30,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEREC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEREC.java
index 18771e9..0c1a389 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ECEREC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -30,7 +29,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEC.java
index c838bb6..6e6e8d8 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -31,7 +30,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPECEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPECEC.java
index c85624b..6a4804f 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPECEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -30,7 +29,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEIEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEIEC.java
index e716619..5e69cd2 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/ICEPEIEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -30,7 +29,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC.java
index ecdba82..2a3df69 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -31,7 +30,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC2.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC2.java
index cb14f01..ebdbbf4 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclazz/NSUBEC2.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclazz;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
@@ -31,7 +30,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+ URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.henshin.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF
index 4609d36..4723226 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Activator: org.eclipse.emf.refactor.metrics.ecore.ocl.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.8.1",
- org.eclipse.emf.refactor.metrics;bundle-version="0.7.0",
- org.eclipse.emf.refactor.metrics.ocl;bundle-version="0.7.0"
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.refactor.metrics,
+ org.eclipse.emf.refactor.metrics.ocl
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NCEAEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NCEAEC.class
new file mode 100644
index 0000000..d0cd9da
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NCEAEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NDEROEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NDEROEC.class
new file mode 100644
index 0000000..c2c019c
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NDEROEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEAEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEAEC.class
new file mode 100644
index 0000000..d0ca09c
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEAEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEOEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEOEC.class
new file mode 100644
index 0000000..09828b2
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEOEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEREC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEREC.class
new file mode 100644
index 0000000..62d142c
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEREC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEROEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEROEC.class
new file mode 100644
index 0000000..824fa07
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEROEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NERSEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NERSEC.class
new file mode 100644
index 0000000..c2a14fa
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NERSEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NPECEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NPECEC.class
new file mode 100644
index 0000000..519dca7
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NPECEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC.class
new file mode 100644
index 0000000..c2fa57a
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC2.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC2.class
new file mode 100644
index 0000000..22f8de9
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC2.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml
index fbe3690..bafb442 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<plugin>
<extension
point="org.eclipse.emf.refactor.metrics">
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nceaec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NCEAEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NCEAEC"
metric_context="EClass"
metric_description="Number of constant EAttributes of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -13,7 +12,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nderoec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NDEROEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NDEROEC"
metric_context="EClass"
metric_description="Number of different EClasses being referenced by the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -21,7 +20,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.npecec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NPECEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NPECEC"
metric_context="EClass"
metric_description="Number of EClasses being parts of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -29,7 +28,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.neroec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEROEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NEROEC"
metric_context="EClass"
metric_description="Number of EReferences of the given EClass to other EClasses."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -37,7 +36,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nersec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NERSEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NERSEC"
metric_context="EClass"
metric_description="Number of EReferences of the given EClass to itself."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -45,7 +44,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nerec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEREC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NEREC"
metric_context="EClass"
metric_description="Total number of EReferences of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -53,7 +52,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.neaec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEAEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NEAEC"
metric_context="EClass"
metric_description="Number of EAttributes of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -61,7 +60,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.neoec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEOEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NEOEC"
metric_context="EClass"
metric_description="Number of EOperations of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -69,7 +68,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nsupec2"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NSUPEC2"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NSUPEC2"
metric_context="EClass"
metric_description="Total number of ancestors of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -77,7 +76,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.nsupec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NSUPEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz.NSUPEC"
metric_context="EClass"
metric_description="Number of direct parent EClasses of the given EClass."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NCEAEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NCEAEC.java
index 3020df1..3133313 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NCEAEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NDEROEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NDEROEC.java
index b94fc1d..1b5965b 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NDEROEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEAEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEAEC.java
index dcd41ee..4c35cb6 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEAEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEOEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEOEC.java
index 37b08c2..fa9ec8e 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEOEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEREC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEREC.java
index d468b17..57ca7b2 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEREC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEROEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEROEC.java
index a6cebfb..a2bde5e 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NEROEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NERSEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NERSEC.java
index e6ea6bf..b0c31cf 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NERSEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NPECEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NPECEC.java
index 1a05bdd..086a657 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NPECEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC.java
index 429b9db..5e907fb 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC2.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC2.java
index 153d0f0..986fc8d 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclazz/NSUPEC2.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/HAGGEC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/HAGGEC.class
similarity index 78%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/HAGGEC.class
rename to org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/HAGGEC.class
index 01592f2..dbd7524 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/HAGGEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/HAGGEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/MAXDITEC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/MAXDITEC.class
similarity index 92%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/MAXDITEC.class
rename to org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/MAXDITEC.class
index 39bbbd8..397be14 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/MAXDITEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/MAXDITEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEPEC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/NEPEC.class
similarity index 92%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEPEC.class
rename to org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/NEPEC.class
index 9a83b4d..fc21244 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclazz/NEPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore/plugin.xml
index cd4e438..8845442 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.ecore/plugin.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<plugin>
<extension point="org.eclipse.emf.refactor.metrics">
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nepec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NEPEC" metric_context="EClass" metric_description="Total number of EParameters in EOperations of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEPEC"/>
+<metric id="org.eclipse.emf.refactor.metrics.ecore.nepec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclazz.NEPEC" metric_context="EClass" metric_description="Total number of EParameters in EOperations of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEPEC"/>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.haggec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.HAGGEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclazz.HAGGEC"
metric_context="EClass"
metric_description="Length of the longest path to the leaves in the aggregation hierarchy."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
@@ -12,7 +12,7 @@
</metric>
<metric
id="org.eclipse.emf.refactor.metrics.ecore.maxditec"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.MAXDITEC"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclazz.MAXDITEC"
metric_context="EClass"
metric_description="Depth of Inheritance Tree (maximum due to multiple inheritance)."
metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/HAGGEC.java b/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/HAGGEC.java
similarity index 89%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/HAGGEC.java
rename to org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/HAGGEC.java
index 86db29c..0d417e0 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/HAGGEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/HAGGEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.eclazz;
import java.util.List;
@@ -30,7 +30,7 @@
for (int i=0; i < haggs.length; i++) {
haggs[i] = 0;
EReference ref = c.getEReferences().get(i);
- if (ref.isContainment()) {
+ if (ref.isContainment() && ref.getEReferenceType() != c) {
haggs[i] = (int) (1 + getHAgg((EClass) ref.getEReferenceType()));
}
}
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/MAXDITEC.java b/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/MAXDITEC.java
similarity index 94%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/MAXDITEC.java
rename to org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/MAXDITEC.java
index 575d274..d835768 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/MAXDITEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/MAXDITEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.eclazz;
import java.util.List;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEPEC.java b/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/NEPEC.java
similarity index 90%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/NEPEC.java
index d61d605..ba08c3e 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclazz/NEPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.eclazz;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.class b/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.class
index 653cbfd..f92c408 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.class
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.java
index fdc73c3..f68cd96 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/umlpack/QACP.java
@@ -14,7 +14,7 @@
private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.tncp";
- IOperation operation = Operations.getOperation("Div");
+ IOperation operation = Operations.getOperation("Division");
@Override
public void setContext(List<EObject> context) {
diff --git a/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/NACP.class b/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/NACP.class
new file mode 100644
index 0000000..43d208a
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/NACP.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/TNCP.class b/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/TNCP.class
new file mode 100644
index 0000000..c7362bd
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/TNCP.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.uml24/plugin.xml b/org.eclipse.emf.refactor.metrics.uml24/plugin.xml
index 638355e..34e3ccc 100644
--- a/org.eclipse.emf.refactor.metrics.uml24/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.uml24/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<plugin>
<extension point="org.eclipse.emf.refactor.metrics">
-<metric id="org.eclipse.emf.refactor.metrics.uml24.nacp" metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.packageuml.NACP" metric_context="Package" metric_description="Number of abstract Classes within the Package" metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML" metric_name="NACP"/>
-<metric id="org.eclipse.emf.refactor.metrics.uml24.tncp" metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.packageuml.TNCP" metric_context="Package" metric_description="Total number of Classes within the Package" metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML" metric_name="TNCP"/>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nacp" metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.NACP" metric_context="Package" metric_description="Number of abstract Classes within the Package" metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML" metric_name="NACP"/>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.tncp" metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.TNCP" metric_context="Package" metric_description="Total number of Classes within the Package" metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML" metric_name="TNCP"/>
</extension>
</plugin>
diff --git a/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/packageuml/NACP.java b/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/NACP.java
similarity index 92%
rename from org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/packageuml/NACP.java
rename to org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/NACP.java
index ed91fe4..882c20b 100644
--- a/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/packageuml/NACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/NACP.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.packageuml;
+package org.eclipse.emf.refactor.metrics.uml24.umlpack;
import java.util.List;
diff --git a/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/packageuml/TNCP.java b/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/TNCP.java
similarity index 92%
rename from org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/packageuml/TNCP.java
rename to org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/TNCP.java
index 134c1f9..a545245 100644
--- a/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/packageuml/TNCP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/TNCP.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.packageuml;
+package org.eclipse.emf.refactor.metrics.uml24.umlpack;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
