Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoulwen Le Fur2015-12-09 09:29:53 +0000
committerGoulwen Le Fur2015-12-09 09:29:53 +0000
commit4a8a7fe7a9deb465377ccd235fb43911f41b31c1 (patch)
tree5a2686da52dd97f7851c1c078e303c034f2856d6
parent7ac0e21528355cb82819fcdbd46500afacee1960 (diff)
downloadorg.eclipse.eef-4a8a7fe7a9deb465377ccd235fb43911f41b31c1.tar.gz
org.eclipse.eef-4a8a7fe7a9deb465377ccd235fb43911f41b31c1.tar.xz
org.eclipse.eef-4a8a7fe7a9deb465377ccd235fb43911f41b31c1.zip
UPDATED: fixed initializer for #482655
-rw-r--r--plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/AbstractTransformer.java5
-rw-r--r--plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ComponentTransformer.java2
-rw-r--r--plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ViewTransformer.java2
3 files changed, 2 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/AbstractTransformer.java b/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/AbstractTransformer.java
index 30db25291..ec3d6b21b 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/AbstractTransformer.java
+++ b/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/AbstractTransformer.java
@@ -84,9 +84,4 @@ public abstract class AbstractTransformer {
return null;
}
- protected boolean isUnmanagedReference(EStructuralFeature feature) {
- return feature instanceof EReference && ((EReference)feature).isContainment()
- && ((EReference)feature).getEType() instanceof EClass;
- }
-
}
diff --git a/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ComponentTransformer.java b/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ComponentTransformer.java
index 68bb75994..172b2a566 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ComponentTransformer.java
+++ b/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ComponentTransformer.java
@@ -70,7 +70,7 @@ public class ComponentTransformer extends AbstractTransformer {
}
for (EStructuralFeature feature : genClass.getEcoreClass().getEAllStructuralFeatures()) {
if (isSignificant(feature) && !feature.isDerived()
- && !inheritedMember(feature, genClass.getEcoreClass()) && !isUnmanagedReference(feature)) {
+ && !inheritedMember(feature, genClass.getEcoreClass())) {
PropertiesEditionElement structuralFeature2EditionElement = eStructuralFeature2EditionElement(
list, feature);
if (structuralFeature2EditionElement != null)
diff --git a/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ViewTransformer.java b/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ViewTransformer.java
index fb2d7c650..9007d0a8f 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ViewTransformer.java
+++ b/plugins/org.eclipse.emf.eef.codegen/src-custom/org/eclipse/emf/eef/codegen/core/initializer/ViewTransformer.java
@@ -104,7 +104,7 @@ public class ViewTransformer extends AbstractTransformer {
container.setRepresentation(getWidget("Group"));
List<EStructuralFeature> features = groups.get(name);
for (EStructuralFeature structuralFeature : features) {
- if (!structuralFeature.isDerived() && !isUnmanagedReference(structuralFeature)) {
+ if (!structuralFeature.isDerived()) {
ElementEditor editor = eStructuralFeature2ViewElement(structuralFeature);
if (editor != null)
container.getElements().add(editor);

Back to the top