diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend index 786e4d6a..cce7bb4f 100644 --- a/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend +++ b/dsl/org.eclipse.emf.parsley.dsl.tests/src/org/eclipse/emf/parsley/dsl/tests/EmfParsleyDslGuiceModuleHelperTest.xtend @@ -130,36 +130,6 @@ provideEditingDomain''', '''.parse.module.allGuiceProviderBindingsMethodsInSuperclass.map[simpleName].join("\n")) } - @Test - def void testGetAllWithExtendsClause() { - assertEqualsStrings( - ''' -LabelProviderImpl -FormFeatureCaptionProviderImpl''', - ''' - module my.test.mod { - labelProvider {} - bindings {} // this is not a WithExtendsClause - formFeatureCaptionProvider {} - } - '''.parseAndAssertNoError.module.allWithExtendsClause.map[class.simpleName].join("\n")) - } - - @Test - def void testGetAllWithExtendsClauseInferredJavaTypes() { - assertEqualsStrings( - ''' -ModLabelProvider -ModFormFeatureCaptionProvider''', - ''' - module my.test.mod { - labelProvider {} - bindings {} // this is not a WithExtendsClause - formFeatureCaptionProvider {} - } - '''.parseAndAssertNoError.module.allWithExtendsClauseInferredJavaTypes.map[simpleName].join("\n")) - } - @Test def void testContainsConstructorAcceptingSinglePluginParameter() { val module = ''' diff --git a/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/util/EmfParsleyDslGuiceModuleHelper.java b/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/util/EmfParsleyDslGuiceModuleHelper.java index 7707981f..e521d5f2 100644 --- a/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/util/EmfParsleyDslGuiceModuleHelper.java +++ b/dsl/org.eclipse.emf.parsley.dsl/src/org/eclipse/emf/parsley/dsl/util/EmfParsleyDslGuiceModuleHelper.java @@ -10,15 +10,12 @@ */ package org.eclipse.emf.parsley.dsl.util; -import static com.google.common.collect.Iterables.concat; import static org.eclipse.xtext.xbase.lib.CollectionLiterals.emptyList; import static org.eclipse.xtext.xbase.lib.IterableExtensions.exists; import static org.eclipse.xtext.xbase.lib.IterableExtensions.filter; import static org.eclipse.xtext.xbase.lib.IterableExtensions.head; -import static org.eclipse.xtext.xbase.lib.IterableExtensions.map; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.parsley.dsl.model.WithExtendsClause; import org.eclipse.emf.parsley.dsl.typing.EmfParsleyDslTypeSystem; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.xtext.common.types.JvmGenericType; @@ -68,15 +65,6 @@ public Iterable getAllGuiceValueBindingsMethodsInSuperclass(final return filter(superTypeJvmOperations(type), it -> it.getSimpleName().startsWith("value")); } - public Iterable getAllWithExtendsClauseInferredJavaTypes( - final org.eclipse.emf.parsley.dsl.model.Module module) { - return concat(map(getAllWithExtendsClause(module), this::getInferredJavaTypes)); - } - - public Iterable getAllWithExtendsClause(final org.eclipse.emf.parsley.dsl.model.Module module) { - return filter(module.eContents(), WithExtendsClause.class); - } - public boolean containsConstructorAcceptingPluginParameter(final EObject context, final JvmTypeReference typeRef) { final JvmType type = typeRef.getType(); if (type instanceof JvmGenericType) {