Loading de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3ImportedNamespaceAwareLocalScopeProvider.java +8 −13 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ import static java.util.Collections.singletonList; import java.util.List; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; Loading @@ -13,7 +12,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.EcoreUtil2; import org.eclipse.xtext.naming.IQualifiedNameConverter; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.ISelectable; Loading @@ -26,8 +24,6 @@ import org.eclipse.xtext.util.Tuples; import com.google.common.collect.Lists; import com.google.inject.Inject; import de.ugoe.cs.swe.tTCN3.Enumeration; import de.ugoe.cs.swe.tTCN3.GroupDef; import de.ugoe.cs.swe.tTCN3.ImportDef; import de.ugoe.cs.swe.tTCN3.TTCN3Module; import de.ugoe.cs.swe.tTCN3.TTCN3Package; Loading @@ -43,9 +39,6 @@ public class TTCN3ImportedNamespaceAwareLocalScopeProvider extends ImportedNames @Inject private IQualifiedNameConverter qualifiedNameConverter; @Inject private IQualifiedNameProvider qualifiedNameProvider; @Override protected IScope getLocalElementsScope(IScope parent, EObject context, EReference reference) { final List<ImportNormalizer> namespaceResolvers = Lists.newArrayList(); Loading Loading @@ -74,7 +67,8 @@ public class TTCN3ImportedNamespaceAwareLocalScopeProvider extends ImportedNames } if (name != null) { ImportNormalizer localNormalizer = doCreateImportNormalizer(name, true, ignoreCase); result = createImportScope(result, singletonList(localNormalizer), allDescriptions, reference.getEReferenceType(),isIgnoreCase(reference)); result = createImportScope(result, singletonList(localNormalizer), allDescriptions, reference.getEReferenceType(), isIgnoreCase(reference)); } return result; } Loading Loading @@ -148,7 +142,8 @@ public class TTCN3ImportedNamespaceAwareLocalScopeProvider extends ImportedNames if (!imports.isEmpty()) { for (Resource r : context.eResource().getResourceSet().getResources()) { ISelectable descriptions = getAllDescriptions(r); IEObjectDescription module = descriptions.getExportedObjectsByType(TTCN3Package.eINSTANCE.getTTCN3Module()).iterator().next(); IEObjectDescription module = descriptions.getExportedObjectsByType(TTCN3Package.eINSTANCE.getTTCN3Module()).iterator() .next(); if (imports.contains(((TTCN3Module) module.getEObjectOrProxy()).getName())) { for (IEObjectDescription e : descriptions.getExportedObjects()) { if (EcoreUtil2.isAssignableFrom(TTCN3Package.eINSTANCE.getGroupDef(), e.getEClass())) { Loading Loading
de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3ImportedNamespaceAwareLocalScopeProvider.java +8 −13 Original line number Diff line number Diff line Loading @@ -5,7 +5,6 @@ import static java.util.Collections.singletonList; import java.util.List; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; Loading @@ -13,7 +12,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.EcoreUtil2; import org.eclipse.xtext.naming.IQualifiedNameConverter; import org.eclipse.xtext.naming.IQualifiedNameProvider; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.IEObjectDescription; import org.eclipse.xtext.resource.ISelectable; Loading @@ -26,8 +24,6 @@ import org.eclipse.xtext.util.Tuples; import com.google.common.collect.Lists; import com.google.inject.Inject; import de.ugoe.cs.swe.tTCN3.Enumeration; import de.ugoe.cs.swe.tTCN3.GroupDef; import de.ugoe.cs.swe.tTCN3.ImportDef; import de.ugoe.cs.swe.tTCN3.TTCN3Module; import de.ugoe.cs.swe.tTCN3.TTCN3Package; Loading @@ -43,9 +39,6 @@ public class TTCN3ImportedNamespaceAwareLocalScopeProvider extends ImportedNames @Inject private IQualifiedNameConverter qualifiedNameConverter; @Inject private IQualifiedNameProvider qualifiedNameProvider; @Override protected IScope getLocalElementsScope(IScope parent, EObject context, EReference reference) { final List<ImportNormalizer> namespaceResolvers = Lists.newArrayList(); Loading Loading @@ -74,7 +67,8 @@ public class TTCN3ImportedNamespaceAwareLocalScopeProvider extends ImportedNames } if (name != null) { ImportNormalizer localNormalizer = doCreateImportNormalizer(name, true, ignoreCase); result = createImportScope(result, singletonList(localNormalizer), allDescriptions, reference.getEReferenceType(),isIgnoreCase(reference)); result = createImportScope(result, singletonList(localNormalizer), allDescriptions, reference.getEReferenceType(), isIgnoreCase(reference)); } return result; } Loading Loading @@ -148,7 +142,8 @@ public class TTCN3ImportedNamespaceAwareLocalScopeProvider extends ImportedNames if (!imports.isEmpty()) { for (Resource r : context.eResource().getResourceSet().getResources()) { ISelectable descriptions = getAllDescriptions(r); IEObjectDescription module = descriptions.getExportedObjectsByType(TTCN3Package.eINSTANCE.getTTCN3Module()).iterator().next(); IEObjectDescription module = descriptions.getExportedObjectsByType(TTCN3Package.eINSTANCE.getTTCN3Module()).iterator() .next(); if (imports.contains(((TTCN3Module) module.getEObjectOrProxy()).getName())) { for (IEObjectDescription e : descriptions.getExportedObjects()) { if (EcoreUtil2.isAssignableFrom(TTCN3Package.eINSTANCE.getGroupDef(), e.getEClass())) { Loading