Commit 2df5a1c2 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ fixed auto-completion fail due to NPE 



Change-Id: I594c4e75f7fa08d00d90256a4cc9ba6ab98bd9f9
Signed-off-by: default avatarmakedonski <makedonski@informatik.uni-goettingen.de>
parent cba58ec5

plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java

+20 −14
Original line number Diff line number Diff line
@@ -97,11 +97,15 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider { 
	}

	

	private Package getPackage(EObject e) {

		if (e.eContainer()!=null) {

			if (e.eContainer() instanceof Package) {

				return (Package)e.eContainer();

			} else {

				return getPackage(e.eContainer());

			}

		} else {

			return (Package)e;

		}

	}

	

	private EList<EObject> getScopedElementsOfType(EObject context, Class c) {
@@ -118,6 +122,7 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider { 
		//within imported packages

		for (ElementImport i : p.getImport()) {

			Package ip = i.getImportedPackage();

			if (ip != null) {

				if (i.getImportedElement().isEmpty()) {

					//import all

					for (PackageableElement e : ip.getPackagedElement()) {
@@ -134,6 +139,7 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider { 
					}

				}

			}

		}

		return elements;

	}

}