new UML metrics (context model) added
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/.gitignore b/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/.gitignore
similarity index 100%
copy from org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/.gitignore
copy to org.eclipse.emf.refactor.metrics.uml24.compositional/bin/.gitignore
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.class b/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.class
deleted file mode 100644
index fb87097..0000000
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml b/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml
index 336f105..0e0f371 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/plugin.xml
@@ -4,8 +4,8 @@
<extension
point="org.eclipse.emf.refactor.metrics">
<metric
- id="org.eclipse.emf.refactor.metrics.uml24.qacp"
- metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.QACP"
+ id="org.eclipse.emf.refactor.metrics.uml24.a"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.A"
metric_context="Package"
metric_description="Quota of abstract classes within the package (Abstractness)"
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
@@ -38,7 +38,48 @@
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
metric_name="MaxDIT">
</metric>
+ <metric
+ id="org.eclipse.emf.refactor.metrics.uml24.gevsc"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.GEvsC"
+ metric_context="Model"
+ metric_description="Ratio between number of inheritance relations and number of classes in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="GEvsC">
+ </metric>
+ <metric
+ id="org.eclipse.emf.refactor.metrics.uml24.atvsc"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.ATvsC"
+ metric_context="Model"
+ metric_description="Ratio between number of owned attributes and number of classes in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="ATvsC">
+ </metric>
+ <metric
+ id="org.eclipse.emf.refactor.metrics.uml24.opvsc"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.OPvsC"
+ metric_context="Model"
+ metric_description="Ratio between number of owned operations and number of classes in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="OPvsC">
+ </metric>
+ <metric
+ id="agvsc"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.AGvsC"
+ metric_context="Model"
+ metric_description="Ratio between number of aggregations and number of classes in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="AGvsC">
+ </metric>
+ <metric
+ id="asvsc"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.ASvsC"
+ metric_context="Model"
+ metric_description="Ratio between number of associations and number of classes in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="ASvsC">
+ </metric>
</extension>
+
<extension
point="org.eclipse.emf.refactor.metrics">
<metric
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/AGvsC.java
similarity index 88%
copy from org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
copy to org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/AGvsC.java
index abe762d..bf8578b 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/AGvsC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.umlpack;
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
import java.util.List;
@@ -8,14 +8,14 @@
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.operations.Operations;
-public class QACP implements IMetricCalculator {
-
- private List<EObject> context;
- private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
- private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.tncp";
-
- IOperation operation = Operations.getOperation("Division");
+public class AGvsC implements IMetricCalculator {
+ private List<EObject> context;
+ private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nagm";
+ private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.ncm";
+
+ IOperation operation = Operations.getOperation("Division");
+
@Override
public void setContext(List<EObject> context) {
this.context = context;
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/ASvsC.java
similarity index 88%
copy from org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
copy to org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/ASvsC.java
index abe762d..cdeec56 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/ASvsC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.umlpack;
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
import java.util.List;
@@ -8,14 +8,14 @@
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.operations.Operations;
-public class QACP implements IMetricCalculator {
-
- private List<EObject> context;
- private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
- private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.tncp";
-
- IOperation operation = Operations.getOperation("Division");
+public class ASvsC implements IMetricCalculator {
+ private List<EObject> context;
+ private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nasm";
+ private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.ncm";
+
+ IOperation operation = Operations.getOperation("Division");
+
@Override
public void setContext(List<EObject> context) {
this.context = context;
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/ATvsC.java
similarity index 88%
copy from org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
copy to org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/ATvsC.java
index abe762d..5168549 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/ATvsC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.umlpack;
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
import java.util.List;
@@ -8,14 +8,14 @@
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.operations.Operations;
-public class QACP implements IMetricCalculator {
-
- private List<EObject> context;
- private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
- private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.tncp";
-
- IOperation operation = Operations.getOperation("Division");
+public class ATvsC implements IMetricCalculator {
+ private List<EObject> context;
+ private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.natm";
+ private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.ncm";
+
+ IOperation operation = Operations.getOperation("Division");
+
@Override
public void setContext(List<EObject> context) {
this.context = context;
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/GEvsC.java
similarity index 88%
copy from org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
copy to org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/GEvsC.java
index abe762d..571e4ab 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/GEvsC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.umlpack;
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
import java.util.List;
@@ -8,14 +8,14 @@
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.operations.Operations;
-public class QACP implements IMetricCalculator {
-
- private List<EObject> context;
- private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
- private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.tncp";
-
- IOperation operation = Operations.getOperation("Division");
+public class GEvsC implements IMetricCalculator {
+ private List<EObject> context;
+ private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nim";
+ private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.ncm";
+
+ IOperation operation = Operations.getOperation("Division");
+
@Override
public void setContext(List<EObject> context) {
this.context = context;
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/OPvsC.java
similarity index 88%
copy from org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
copy to org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/OPvsC.java
index abe762d..cc9e363 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/OPvsC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.uml24.umlpack;
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
import java.util.List;
@@ -8,14 +8,14 @@
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.operations.Operations;
-public class QACP implements IMetricCalculator {
-
- private List<EObject> context;
- private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
- private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.tncp";
-
- IOperation operation = Operations.getOperation("Division");
+public class OPvsC implements IMetricCalculator {
+ private List<EObject> context;
+ private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nom";
+ private String metricID2 = "org.eclipse.emf.refactor.metrics.uml24.ncm";
+
+ IOperation operation = Operations.getOperation("Division");
+
@Override
public void setContext(List<EObject> context) {
this.context = context;
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/A.java
similarity index 95%
rename from org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
rename to org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/A.java
index abe762d..10309b8 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/QACP.java
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/umlpack/A.java
@@ -8,7 +8,7 @@
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.operations.Operations;
-public class QACP implements IMetricCalculator {
+public class A implements IMetricCalculator {
private List<EObject> context;
private String metricID1 = "org.eclipse.emf.refactor.metrics.uml24.nacp";
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/.gitignore b/org.eclipse.emf.refactor.metrics.uml24.henshin/bin/.gitignore
similarity index 100%
rename from org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/.gitignore
rename to org.eclipse.emf.refactor.metrics.uml24.henshin/bin/.gitignore
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/.gitignore b/org.eclipse.emf.refactor.metrics.uml24.ocl/bin/.gitignore
similarity index 100%
copy from org.eclipse.emf.refactor.refactorings.uml24/bin/.gitignore
copy to org.eclipse.emf.refactor.metrics.uml24.ocl/bin/.gitignore
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/plugin.xml b/org.eclipse.emf.refactor.metrics.uml24.ocl/plugin.xml
index 24111b8..e589d13 100644
--- a/org.eclipse.emf.refactor.metrics.uml24.ocl/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/plugin.xml
@@ -4,37 +4,101 @@
<metric id="org.eclipse.emf.refactor.metrics.uml24.ncm"
metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NCM"
metric_context="Model"
- metric_description="Number of Classes in the Model"
+ metric_description="Number of classes in the model"
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
metric_name="NCM">
</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nim"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NIM"
+ metric_context="Model"
+ metric_description="Number of inheritance relations in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NIM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.natm"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NATM"
+ metric_context="Model"
+ metric_description="Number of directly owned attributes in classes within the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NATM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nom"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NOM"
+ metric_context="Model"
+ metric_description="Number of directly owned operations in classes within the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NOM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nasm"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NASM"
+ metric_context="Model"
+ metric_description="Number of associations in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NASM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nagm"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NAGM"
+ metric_context="Model"
+ metric_description="Number of aggregations in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NAGM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nactm"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NACTM"
+ metric_context="Model"
+ metric_description="Number of attributes with class type in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NACTM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.nnoem"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NNOEM"
+ metric_context="Model"
+ metric_description="Number of navigable owned association ends in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NNOEM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.npm"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.NPM"
+ metric_context="Model"
+ metric_description="Number of packages in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="NPM">
+</metric>
+<metric id="org.eclipse.emf.refactor.metrics.uml24.tnme"
+ metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlmodel.TNME"
+ metric_context="Model"
+ metric_description="Total number of elements in the model"
+ metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
+ metric_name="TNME">
+</metric>
</extension>
+
<extension point="org.eclipse.emf.refactor.metrics">
<metric id="org.eclipse.emf.refactor.metrics.uml24.nccp"
metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.NCCP"
metric_context="Package"
- metric_description="Number of concrete Classes within the Package"
+ metric_description="Number of concrete classes within the package"
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
metric_name="NCCP">
</metric>
<metric id="org.eclipse.emf.refactor.metrics.uml24.ninp"
metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.NINP"
metric_context="Package"
- metric_description="Number of Interfaces within the Package"
+ metric_description="Number of interfaces within the package"
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
metric_name="NINP">
</metric>
<metric id="org.eclipse.emf.refactor.metrics.uml24.natp"
metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.NATP"
metric_context="Package"
- metric_description="Number of Attributes in Classes within the Package"
+ metric_description="Number of attributes in classes within the package"
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
metric_name="NATP">
</metric>
<metric id="org.eclipse.emf.refactor.metrics.uml24.nopp"
metric_calculate_class="org.eclipse.emf.refactor.metrics.uml24.umlpack.NOPP"
metric_context="Package"
- metric_description="Number of Operations in Classes and Interfaces within the Package"
+ metric_description="Number of operations in classes and Interfaces within the package"
metric_metamodel="http://www.eclipse.org/uml2/4.0.0/UML"
metric_name="NOPP">
</metric>
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NACTM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NACTM.java
new file mode 100644
index 0000000..5a4ca1b
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NACTM.java
@@ -0,0 +1,30 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NACTM implements IMetricCalculator {
+
+ private final String expression =
+ "Class.allInstances() "
+ + "-> collect(ownedAttribute) "
+ + "-> reject(type.oclIsUndefined()) "
+ + "-> select(type.oclIsTypeOf(Class)) "
+ + "-> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NAGM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NAGM.java
new file mode 100644
index 0000000..43823d6
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NAGM.java
@@ -0,0 +1,28 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NAGM implements IMetricCalculator {
+
+ private final String expression =
+ "Property.allInstances() "
+ + "-> reject(association.oclIsUndefined() or aggregation=AggregationKind::none) "
+ + "-> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NASM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NASM.java
new file mode 100644
index 0000000..caeb9a7
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NASM.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NASM implements IMetricCalculator {
+
+ private final String expression =
+ "Association.allInstances() -> reject(oclIsTypeOf(AssociationClass)) -> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NATM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NATM.java
new file mode 100644
index 0000000..f690f21
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NATM.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NATM implements IMetricCalculator {
+
+ private final String expression =
+ "Class.allInstances() -> collect(ownedAttribute) -> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NIM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NIM.java
new file mode 100644
index 0000000..30b191c
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NIM.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NIM implements IMetricCalculator {
+
+ private final String expression =
+ "Generalization.allInstances() -> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NNOEM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NNOEM.java
new file mode 100644
index 0000000..42c587a
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NNOEM.java
@@ -0,0 +1,28 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NNOEM implements IMetricCalculator {
+
+ private final String expression =
+ "Association.allInstances() "
+ + "-> collect(navigableOwnedEnd) "
+ + "-> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NOM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NOM.java
new file mode 100644
index 0000000..209a075
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NOM.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NOM implements IMetricCalculator {
+
+ private final String expression =
+ "Class.allInstances() -> collect(ownedOperation) -> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NPM.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NPM.java
new file mode 100644
index 0000000..bac3348
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/NPM.java
@@ -0,0 +1,26 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class NPM implements IMetricCalculator {
+
+ private final String expression =
+ "Package.allInstances() -> reject(oclIsTypeOf(Model)) -> size()";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/TNME.java b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/TNME.java
new file mode 100644
index 0000000..3181b02
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.ocl/src/org/eclipse/emf/refactor/metrics/uml24/umlmodel/TNME.java
@@ -0,0 +1,37 @@
+package org.eclipse.emf.refactor.metrics.uml24.umlmodel;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
+import org.eclipse.emf.refactor.metrics.ocl.managers.OCLManager;
+
+public class TNME implements IMetricCalculator {
+
+ private final String expression =
+ "(Package.allInstances() -> reject(oclIsTypeOf(Model)) -> size()) + "
+ + "(Class.allInstances() -> reject(oclIsTypeOf(StateMachine)) -> size()) + "
+ + "(Interface.allInstances() -> size()) + "
+ + "(Class.allInstances() -> collect(ownedAttribute) -> size()) + "
+ + "(Operation.allInstances() -> size()) + "
+ + "(Parameter.allInstances() -> size()) + "
+ + "(Association.allInstances() -> reject(oclIsTypeOf(AssociationClass)) -> size()) + "
+ + "(Association.allInstances() -> reject(oclIsTypeOf(AssociationClass)) -> collect(ownedEnd) -> size()) + "
+ + "(Generalization.allInstances() -> size()) + "
+ + "(InterfaceRealization.allInstances() -> size()) + "
+ + "(Enumeration.allInstances() -> size()) + "
+ + "(EnumerationLiteral.allInstances() -> size())";
+ private List<EObject> context;
+
+ @Override
+ public void setContext(List<EObject> context) {
+ this.context = context;
+ }
+
+ @Override
+ public double calculate() {
+ EObject contextObject = context.get(0);
+ return OCLManager.evaluateOCLOnContextObject(contextObject, expression);
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/.gitignore b/org.eclipse.emf.refactor.metrics.uml24/bin/.gitignore
similarity index 100%
rename from org.eclipse.emf.refactor.refactorings.uml24/bin/.gitignore
rename to org.eclipse.emf.refactor.metrics.uml24/bin/.gitignore
diff --git a/org.eclipse.emf.refactor.metrics.uml24/plugin.xml b/org.eclipse.emf.refactor.metrics.uml24/plugin.xml
index c94ddd5..88d5405 100644
--- a/org.eclipse.emf.refactor.metrics.uml24/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.uml24/plugin.xml
@@ -49,6 +49,7 @@
metric_name="NEIPO">
</metric>
</extension>
+
<extension point="org.eclipse.emf.refactor.metrics">
<metric
id="org.eclipse.emf.refactor.metrics.uml24.nih"
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringInformation.class
index 68f46f6..f780d3d 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringTest.class
index 2a30d4c..ff93db9 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createreferencedeclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringInformation.class
index b1691da..0550f66 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringTest.class
index 0bfc775..1aefe70 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsubeclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringInformation.class
index 610ebc5..eadf8d4 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringTest.class
index 2073e90..b58e1c5 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/createsupereclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringInformation.class
index 7852975..88a3926 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringTest.class
index 2e5deaa..d392fd4 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/moveeattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringInformation.class
index 039c236..af97b98 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringTest.class
index 9e084e0..a12a3e0 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pullupeattributeusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringInformation.class
index 8f60b41..05cd6cf 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringTest.class
index 90b6958..4db8431 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/pushdowneattributeusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringInformation.class
index 9690147..5f174de 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringTest.class
index 596cc15..97fbe48 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptyreferencedeclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringInformation.class
index 9dc9af3..2ebec34 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringTest.class
index 8b2073e..b49917d 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysubeclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringInformation.class
index f73f437..14d16cc 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringTest.class
index 648aad8..6819cc3 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/removeemptysupereclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringInformation.class
index 6b6d92b..3996a8f 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringTest.class
index 00bc3c9..a143636 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeattributeusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringInformation.class
index 882b7e4..27c0aaf 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringTest.class
index 925a071..5c2fb71 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeclassusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringInformation.class
index f1727a0..38f4e96 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringTest.class
index a45811b..1e1e10e 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameedatatypeusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringInformation.class
index 4c51258..df59047 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringTest.class
index 5ceda4c..4e3cf55 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameeenumliteralusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringInformation.class
index e7b7a21..a8e613e 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringTest.class
index b89c345..4ed5788 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameepackageusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringInformation.class
index 44cfa4a..cdd782f 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringTest.class
index 9330409..dbebe6c 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore.henshin/bin/org/eclipse/emf/refactor/refactorings/ecore/henshin/renameereferenceusinghenshin/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringController$InternalRefactoringProcessor.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringController$InternalRefactoringProcessor.class
index 6d73e0c..88b7073 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringController$InternalRefactoringProcessor.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringController$InternalRefactoringProcessor.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringTest.class
index 5d0d0a5..c2d457a 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/addparameter/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createreferencedeclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createreferencedeclass/RefactoringTest.class
index 5ab5834..89daa08 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createreferencedeclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createreferencedeclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsubeclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsubeclass/RefactoringTest.class
index 02868b7..6f5e38a 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsubeclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsubeclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsupereclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsupereclass/RefactoringTest.class
index d3e187c..0ffedf8 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsupereclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/createsupereclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeattribute/RefactoringTest.class
index 64b1af8..fdf224b 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeoperation/RefactoringTest.class
index 51250c4..7ff93c8 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/moveeoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeattribute/RefactoringTest.class
index eb6cdb5..08270c2 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeoperation/RefactoringTest.class
index b400094..a1e6feb 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pullupeoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneattribute/RefactoringTest.class
index b18dcfb..8fe9618 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneoperation/RefactoringTest.class
index f9762e7..733e6d9 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/pushdowneoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptyreferencedeclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptyreferencedeclass/RefactoringTest.class
index 3789d1b..cc97e2d 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptyreferencedeclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptyreferencedeclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysubeclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysubeclass/RefactoringTest.class
index d8be90c..7ca305a 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysubeclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysubeclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysupereclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysupereclass/RefactoringTest.class
index 5bf323e..7df135e 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysupereclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeemptysupereclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeeparameter/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeeparameter/RefactoringTest.class
index 7d3d6b9..2084449 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeeparameter/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/removeeparameter/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeattribute/RefactoringTest.class
index 85538e7..29885e8 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeclass/RefactoringTest.class
index 310b011..f216287 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameedatatype/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameedatatype/RefactoringTest.class
index 628a2cd..ed59287 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameedatatype/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameedatatype/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeenumliteral/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeenumliteral/RefactoringTest.class
index cf040e8..4d81398 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeenumliteral/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeenumliteral/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeoperation/RefactoringTest.class
index adaae62..9b1b80b 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameepackage/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameepackage/RefactoringTest.class
index b46fbf3..59fff86 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameepackage/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameepackage/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeparameter/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeparameter/RefactoringTest.class
index 178e0c7..064a8d7 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeparameter/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameeparameter/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameereference/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameereference/RefactoringTest.class
index c0a0b14..dfc5f90 100644
--- a/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameereference/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.ecore/bin/org/eclipse/emf/refactor/refactorings/ecore/renameereference/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class
index 6f6318b..8b91daa 100644
--- a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.class
index c09efad..31546f6 100644
--- a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.class
index 8571b89..14c268a 100644
--- a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java
index 6fa9291..c6cd191 100644
--- a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java
@@ -6,15 +6,22 @@
*/
package org.eclipse.emf.refactor.refactorings.uml24.pullupattribute;
+import java.util.List;
+
+import org.eclipse.emf.refactor.refactoring.runtime.ltk.ui.AbstractRefactoringWizard;
+import org.eclipse.emf.refactor.refactoring.runtime.ui.IInputPageButtonCreator;
+import org.eclipse.emf.refactor.refactoring.runtime.ui.InputPageButtonLoader;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Property;
/**
* Class for setting model refactoring specific parameters
@@ -36,11 +43,9 @@
*/
private Label classNameLabel;
- /**
- * TextField for each parameter.
- * @generated
- */
- private Text classNameWidget;
+ private List<Class> superclasses;
+
+ private Combo classNameWidget;
/**
* Default constructor using a name and the controller of the
@@ -52,7 +57,15 @@
public RefactoringWizardPage
(String name, RefactoringController controller) {
super(name);
- this.controller = controller;
+ this.controller = controller;
+ this.setUpMembers();
+ }
+
+ private void setUpMembers() {
+ RefactoringDataManagement dataManagement = (RefactoringDataManagement) this.controller.getDataManagementObject();
+ Property attribute = (Property) dataManagement.getInPortByName(dataManagement.SELECTEDEOBJECT).getValue();
+ Class owningClass = attribute.getClass_();
+ superclasses = owningClass.getSuperClasses();
}
/**
@@ -65,8 +78,9 @@
public void handleEvent(Event event) {
getWizard().getContainer().updateButtons();
- if (classNameWidget != null) {
- String className = classNameWidget.getText();
+ if (classNameWidget != null) {
+ int index = classNameWidget.getSelectionIndex();
+ String className = superclasses.get(index).getName();
if (!className.isEmpty()){
((RefactoringDataManagement)
this.controller.getDataManagementObject()).
@@ -79,7 +93,6 @@
setValue("unspecified");
}
}
-
}
/**
@@ -97,16 +110,23 @@
classNameLabel = new Label(composite, SWT.NONE);
- classNameLabel.setText("Name of the superclass the attribute should be moved to: ");
+ classNameLabel.setText("Name of the superclass to be pulled up to: ");
classNameLabel.setEnabled(true);
- classNameWidget = new Text(composite, SWT.BORDER);
+ classNameWidget = new Combo(composite, SWT.DROP_DOWN | SWT.BORDER);
classNameWidget.setToolTipText
("value of variable 'className'");
classNameWidget.setEnabled(true);
classNameWidget.setLayoutData(gd);
- classNameWidget.addListener(SWT.Modify, this);
+ classNameWidget.addListener(SWT.Modify, this);
+ for (int i = 0; i < superclasses.size(); i++) {
+ classNameWidget.add(superclasses.get(i).getQualifiedName());
+ }
+ List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+ for(IInputPageButtonCreator creator : buttonCreators){
+ creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+ }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.java
index b41fd16..281afea 100644
--- a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringWizardPage.java
@@ -16,6 +16,7 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
/**
@@ -68,10 +69,14 @@
gl.numColumns = 2;
composite.setLayout(gl);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+ Label newNameLabel = new Label(composite, SWT.NONE);
+ newNameLabel.setText("This refactoring does not have any parameters.");
+ newNameLabel.setEnabled(true);
+
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.java
index db5f5d5..4700dcb 100644
--- a/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.papyrus.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringWizardPage.java
@@ -13,9 +13,11 @@
import org.eclipse.emf.refactor.refactoring.runtime.ui.InputPageButtonLoader;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
/**
@@ -66,12 +68,16 @@
Composite composite = new Composite(parent, SWT.NONE);
GridLayout gl = new GridLayout();
gl.numColumns = 2;
- composite.setLayout(gl);
+ composite.setLayout(gl);
+
+ Label newNameLabel = new Label(composite, SWT.NONE);
+ newNameLabel.setText("This refactoring does not have any parameters.");
+ newNameLabel.setEnabled(true);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/createclasswithattributesfromparameterlist/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/createclasswithattributesfromparameterlist/RefactoringTest.class
index b4ee07a..058f109 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/createclasswithattributesfromparameterlist/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/createclasswithattributesfromparameterlist/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractclass/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractclass/RefactoringDataManagement.class
index 013a776..67dd700 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractclass/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractclass/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsubclass/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsubclass/RefactoringDataManagement.class
index 78bae2f..54e6252 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsubclass/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsubclass/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsuperclass/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsuperclass/RefactoringDataManagement.class
index f2effe2..0212b1f 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsuperclass/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/extractsuperclass/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/inlineclass/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/inlineclass/RefactoringDataManagement.class
index 18c5640..4bcdf9d 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/inlineclass/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/inlineclass/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/introduceparameterobject/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/introduceparameterobject/RefactoringDataManagement.class
index c79a9a5..307f11d 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/introduceparameterobject/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/introduceparameterobject/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringDataManagement.class
index e1fb033..1cf8cd1 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.class
index b45fa5d..b2408e9 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/bin/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.compositional/src/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24.compositional/src/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.java
index bd4e0eb..53d1da9 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.compositional/src/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.compositional/src/org/eclipse/emf/refactor/refactorings/uml24/removesuperclass/RefactoringWizardPage.java
@@ -16,6 +16,7 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
/**
@@ -68,10 +69,14 @@
gl.numColumns = 2;
composite.setLayout(gl);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+ Label newNameLabel = new Label(composite, SWT.NONE);
+ newNameLabel.setText("This refactoring does not have any parameters.");
+ newNameLabel.setEnabled(true);
+
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringInformation.class
index b1f872e..c654e83 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringTest.class
index 82d3922..b5e5a43 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/createassociatedclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.class
index e848503..a2ae802 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringInformation.class
index f3cdf40..af8fba1 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringTest.class
index 690dffd..fa9d0db 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.class
index 2a1e8ed..c5c0266 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringInformation.class
index da8dba5..922162c 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringTest.class
index 5a857ec..c9addcd 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/removeunusedinterface/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.class
index 82b11f1..eedda2e 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.class
index bd54d7c..f473275 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringInformation.class
index 78294fc..d928cf3 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringTest.class
index 5af133f..d2bddb5 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.class
index 50328dc..195aced 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.class
index 760ed58..1f500a7 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringInformation.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringInformation.class
index f07bd2d..9d5a0c1 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringInformation.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringInformation.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringTest.class
index 8776599..d05796e 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.class
index e7850c6..a6480ce 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.java
index 5d45d9e..5fc5740 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringGuiHandler.java
@@ -62,13 +62,12 @@
@Override
public boolean showInMenu(List<EObject> selection) {
if (selection.size() > 1) return false;
- for(EObject o:selection){
- if(null != o){
- if (o instanceof org.eclipse.uml2.uml.Property) {
- return true;
- }
- }
- }
+ EObject o = selection.get(0);
+ if(null != o){
+ if (o instanceof org.eclipse.uml2.uml.Property) {
+ return true;
+ }
+ }
return false;
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.java
index ed56c9b..bbe0773 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/hideattribute/RefactoringWizardPage.java
@@ -68,10 +68,10 @@
gl.numColumns = 2;
composite.setLayout(gl);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.java
index 15f0ce8..b2194a2 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringDataManagement.java
@@ -21,7 +21,7 @@
public class RefactoringDataManagement extends DataManagementAdapter
implements IHenshinDataManagement {
- private final String SELECTEDEOBJECT = "selectedEObject";
+ protected final String SELECTEDEOBJECT = "selectedEObject";
private final String INITIALFILENAME = "rename_attribute_initial";
private final String FINALFILENAME = "rename_attribute_final";
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.java
index 069b828..3fd3db2 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringGuiHandler.java
@@ -60,14 +60,18 @@
*/
@Override
public boolean showInMenu(List<EObject> selection) {
- if (selection.size() > 1) return false;
- for(EObject o:selection){
- if(null != o){
- if (o instanceof org.eclipse.uml2.uml.Property) {
+ if (selection.size() > 2) return false;
+ EObject o = selection.get(0);
+ if(null != o){
+ if (o instanceof org.eclipse.uml2.uml.Property) {
+ if (selection.size() == 2) {
+ EObject eo = selection.get(1);
+ if (eo.eClass().getName().equals("Diagram")) return true;
+ } else {
return true;
}
- }
- }
+ }
+ }
return false;
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.java
index 2840946..acfb021 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/renameattribute/RefactoringWizardPage.java
@@ -15,6 +15,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.uml2.uml.NamedElement;
/**
* Class for setting model refactoring specific parameters
@@ -105,11 +106,17 @@
("value of variable 'newName'");
newNameWidget.setEnabled(true);
newNameWidget.setLayoutData(gd);
- newNameWidget.addListener(SWT.Modify, this);
-
+ newNameWidget.addListener(SWT.Modify, this);
+ setName();
setControl(composite);
}
+ private void setName() {
+ RefactoringDataManagement dataManagement = (RefactoringDataManagement) this.controller.getDataManagementObject();
+ NamedElement ne = (NamedElement) dataManagement.getInPortByName(dataManagement.SELECTEDEOBJECT).getValue();
+ newNameWidget.setText(ne.getName());
+ }
+
}
\ No newline at end of file
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.java
index 239b833..3ea1a41 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringGuiHandler.java
@@ -62,13 +62,12 @@
@Override
public boolean showInMenu(List<EObject> selection) {
if (selection.size() > 1) return false;
- for(EObject o:selection){
- if(null != o){
- if (o instanceof org.eclipse.uml2.uml.Property) {
- return true;
- }
- }
- }
+ EObject o = selection.get(0);
+ if(null != o){
+ if (o instanceof org.eclipse.uml2.uml.Property) {
+ return true;
+ }
+ }
return false;
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.java
index 12999fe..25fd607 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24.henshin/src/org/eclipse/emf/refactor/refactorings/uml24/showattribute/RefactoringWizardPage.java
@@ -70,10 +70,10 @@
gl.numColumns = 2;
composite.setLayout(gl);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/addparameter/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/addparameter/RefactoringTest.class
index 508f3f3..a960a00 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/addparameter/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/addparameter/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsubclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsubclass/RefactoringTest.class
index c326ac5..be5f3c9 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsubclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsubclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsuperclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsuperclass/RefactoringTest.class
index 2c36915..27b4d6b 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsuperclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/createsuperclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveattribute/RefactoringTest.class
index 431171d..32d4374 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveoperation/RefactoringTest.class
index 87191a5..ad9d1ee 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/moveoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringTest.class
index 662dacd..ef91964 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class
index 6f6318b..2e735c2 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupoperation/RefactoringTest.class
index 07f63b1..4c21c3f 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pullupoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringTest.class
index 25aa92b..f021c4b 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownattribute/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownoperation/RefactoringTest.class
index 64745f2..703bc1d 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/pushdownoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptyassociatedclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptyassociatedclass/RefactoringTest.class
index 9f36570..5b667f7 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptyassociatedclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptyassociatedclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysubclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysubclass/RefactoringTest.class
index dfbd923..753d38d 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysubclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysubclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringTest.class
index bed9b40..a064b7c 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeemptysuperclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeparameter/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeparameter/RefactoringTest.class
index 1518f08..539ba7f 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeparameter/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/removeparameter/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.class
index 84679e7..c95f481 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringTest.class
index 9fb9086..ad0b6ca 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.class
index 482e722..3a85bf7 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.class
index 423b7fb..757c2cb 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringTest.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringTest.class
index 0085110..47cfc68 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringTest.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringTest.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.class b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.class
index c76936c..394691e 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.class
+++ b/org.eclipse.emf.refactor.refactorings.uml24/bin/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java
index 6fa9291..b5e9b42 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/pullupattribute/RefactoringWizardPage.java
@@ -6,6 +6,11 @@
*/
package org.eclipse.emf.refactor.refactorings.uml24.pullupattribute;
+import java.util.List;
+
+import org.eclipse.emf.refactor.refactoring.runtime.ltk.ui.AbstractRefactoringWizard;
+import org.eclipse.emf.refactor.refactoring.runtime.ui.IInputPageButtonCreator;
+import org.eclipse.emf.refactor.refactoring.runtime.ui.InputPageButtonLoader;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -106,7 +111,11 @@
classNameWidget.setEnabled(true);
classNameWidget.setLayoutData(gd);
classNameWidget.addListener(SWT.Modify, this);
-
+
+ List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+ for(IInputPageButtonCreator creator : buttonCreators){
+ creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+ }
setControl(composite);
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.java b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.java
index b36653d..f4cfde9 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringGuiHandler.java
@@ -61,14 +61,18 @@
*/
@Override
public boolean showInMenu(List<EObject> selection) {
- if (selection.size() > 1) return false;
- for(EObject o:selection){
- if(null != o){
- if (o instanceof org.eclipse.uml2.uml.Class) {
+ if (selection.size() > 2) return false;
+ EObject o = selection.get(0);
+ if(null != o){
+ if (o instanceof org.eclipse.uml2.uml.Class) {
+ if (selection.size() == 2) {
+ EObject eo = selection.get(1);
+ if (eo.eClass().getName().equals("Diagram")) return true;
+ } else {
return true;
}
- }
- }
+ }
+ }
return false;
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.java
index c8d5486..355cc7c 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameclass/RefactoringWizardPage.java
@@ -6,11 +6,6 @@
*/
package org.eclipse.emf.refactor.refactorings.uml24.renameclass;
-import java.util.List;
-
-import org.eclipse.emf.refactor.refactoring.runtime.ltk.ui.AbstractRefactoringWizard;
-import org.eclipse.emf.refactor.refactoring.runtime.ui.IInputPageButtonCreator;
-import org.eclipse.emf.refactor.refactoring.runtime.ui.InputPageButtonLoader;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -20,6 +15,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.uml2.uml.NamedElement;
/**
* Class for setting model refactoring specific parameters
@@ -112,13 +108,20 @@
newNameWidget.setLayoutData(gd);
newNameWidget.addListener(SWT.Modify, this);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
+ setName();
setControl(composite);
}
+ private void setName() {
+ RefactoringDataManagement dataManagement = (RefactoringDataManagement) this.controller.getDataManagementObject();
+ NamedElement ne = (NamedElement) dataManagement.getInPortByName(dataManagement.SELECTEDEOBJECT).getValue();
+ newNameWidget.setText(ne.getName());
+ }
+
}
\ No newline at end of file
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.java b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.java
index ad44735..887b58b 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringGuiHandler.java
@@ -60,14 +60,18 @@
*/
@Override
public boolean showInMenu(List<EObject> selection) {
- if (selection.size() > 1) return false;
- for(EObject o:selection){
- if(null != o){
- if (o instanceof org.eclipse.uml2.uml.Operation) {
+ if (selection.size() > 2) return false;
+ EObject o = selection.get(0);
+ if(null != o){
+ if (o instanceof org.eclipse.uml2.uml.Operation) {
+ if (selection.size() == 2) {
+ EObject eo = selection.get(1);
+ if (eo.eClass().getName().equals("Diagram")) return true;
+ } else {
return true;
}
- }
- }
+ }
+ }
return false;
}
diff --git a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.java b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.java
index a2ddf42..4a0fa4b 100644
--- a/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.java
+++ b/org.eclipse.emf.refactor.refactorings.uml24/src/org/eclipse/emf/refactor/refactorings/uml24/renameoperation/RefactoringWizardPage.java
@@ -6,11 +6,6 @@
*/
package org.eclipse.emf.refactor.refactorings.uml24.renameoperation;
-import java.util.List;
-
-import org.eclipse.emf.refactor.refactoring.runtime.ltk.ui.AbstractRefactoringWizard;
-import org.eclipse.emf.refactor.refactoring.runtime.ui.IInputPageButtonCreator;
-import org.eclipse.emf.refactor.refactoring.runtime.ui.InputPageButtonLoader;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -20,6 +15,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.uml2.uml.NamedElement;
/**
* Class for setting model refactoring specific parameters
@@ -112,13 +108,20 @@
newNameWidget.setLayoutData(gd);
newNameWidget.addListener(SWT.Modify, this);
- List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
- for(IInputPageButtonCreator creator : buttonCreators){
- creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
- }
+// List<IInputPageButtonCreator> buttonCreators = InputPageButtonLoader.iNSTANCE.getInputPageButtonCreatorClasses();
+// for(IInputPageButtonCreator creator : buttonCreators){
+// creator.createButton(composite, controller, (AbstractRefactoringWizard)this.getWizard());
+// }
+ setName();
setControl(composite);
}
+ private void setName() {
+ RefactoringDataManagement dataManagement = (RefactoringDataManagement) this.controller.getDataManagementObject();
+ NamedElement ne = (NamedElement) dataManagement.getInPortByName(dataManagement.SELECTEDEOBJECT).getValue();
+ newNameWidget.setText(ne.getName());
+ }
+
}
\ No newline at end of file
diff --git a/org.eclipse.emf.refactor.smells.uml24.henshin/bin/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.class b/org.eclipse.emf.refactor.smells.uml24.henshin/bin/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.class
index cf75665..bf20392 100644
--- a/org.eclipse.emf.refactor.smells.uml24.henshin/bin/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.class
+++ b/org.eclipse.emf.refactor.smells.uml24.henshin/bin/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.uml24.henshin/src/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.java b/org.eclipse.emf.refactor.smells.uml24.henshin/src/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.java
index 0630a3d..8eac0ec 100644
--- a/org.eclipse.emf.refactor.smells.uml24.henshin/src/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.java
+++ b/org.eclipse.emf.refactor.smells.uml24.henshin/src/org/eclipse/emf/refactor/smells/uml24/henshin/EquallyNamedClasses.java
@@ -19,7 +19,25 @@
@Override
public LinkedList<LinkedList<EObject>> findSmell(EObject root) {
String fullPath = getFullPath(transformationPath + henshinFileName);
- return HenshinRuntimeManager.run(root, fullPath);
+ LinkedList<LinkedList<EObject>> results = HenshinRuntimeManager.run(root, fullPath);
+ return removeRedundantResults(results);
+ }
+
+ private LinkedList<LinkedList<EObject>> removeRedundantResults(
+ LinkedList<LinkedList<EObject>> results) {
+ LinkedList<LinkedList<EObject>> redundantResults = new LinkedList<LinkedList<EObject>>();
+ for (int i = 0; i < results.size(); i++) {
+ LinkedList<EObject> result1 = results.get(i);
+ for (int j = i+1; j < results.size(); j++) {
+ LinkedList<EObject> result2 = results.get(j);
+ if (result1.getFirst() == result2.getLast() &&
+ result2.getFirst() == result1.getLast()) {
+ redundantResults.add(result2);
+ }
+ }
+ }
+ results.removeAll(redundantResults);
+ return results;
}
private String getFullPath(String transformationPath){
diff --git a/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.class b/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.class
index 6526b0e..41eb8ec 100644
--- a/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.class
+++ b/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.uml24/src/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.java b/org.eclipse.emf.refactor.smells.uml24/src/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.java
index 522f049..5f1fdd5 100644
--- a/org.eclipse.emf.refactor.smells.uml24/src/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.java
+++ b/org.eclipse.emf.refactor.smells.uml24/src/org/eclipse/emf/refactor/smells/uml24/EqualAttributesinSiblingClasses.java
@@ -147,7 +147,8 @@
private ArrayList<Class> getAllClasses(Model model) {
ArrayList<Class> classes = new ArrayList<Class>();
- TreeIterator<EObject> iter = model.eResource().getAllContents();
+// TreeIterator<EObject> iter = model.eResource().getAllContents();
+ TreeIterator<EObject> iter = getRoot(model).eAllContents();
while (iter.hasNext()) {
EObject eObject = iter.next();
if (eObject instanceof Class) {
@@ -156,6 +157,11 @@
}
return classes;
}
+
+ private EObject getRoot(EObject eObject) {
+ if (eObject.eContainer() == null) return eObject;
+ else return getRoot(eObject.eContainer());
+ }
private List<Property> getAllClassAttributes(EObject root) {
List<Property> attributes = new ArrayList<Property>();
