Merge branch '4138' into 'master'

4138:  Avoid NPE for DerivedAnnotations not backed by an EStructuralFeature

See merge request !143

org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/.ratings

 AnnotationInstSpec.java b4f2ed47a8984e751e04049de5bdb3cad2c0a933 GREEN
 DerivedAnnotationValueProviderBase.java afedd21d3469127bbb20adb34c191b5c9c980f6c GREEN
-EStructuralFeatureDescriptor.java 2e14df3830d854bc1693382727b2033b23d0051c GREEN
+EStructuralFeatureDescriptor.java 9665d0d3040278243dd37591535e411a90fa63bf GREEN
 EStructuralFeatureValueProviderBase.java 287facbbce47c16d892bae82a214f64ceeef2263 GREEN
 IAnnotationValueProvider.java 08e0e5f66dc97865e9ac03e1ac646af332845e14 GREEN
 ValueProviderBase.java e4e866840845346ec99a4304048f5327c4890996 GREEN

org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureDescriptor.java

@@ -42,25 +42,25 @@ public class EStructuralFeatureDescriptor {
 	 * resolved.
 	 */
 	public enum EReferenceScope {
-	/** Current project (all models). */
-	PROJECT,
-
-	/** Current model (e.g., ComponentArchitecture). */
-	MODEL,
-
-	/**
-	 * Sub-model below the {@link IModelElement} to which the annotation is attached that
-	 * contains the {@link EStructuralFeature} managed by this
-	 * {@link EStructuralFeatureDescriptor} (including the element itself).
-	 */
-	SUB_MODEL,
-
-	/**
-	 * Sub-model below the {@link IModelElement} to which the annotation is attached that
-	 * contains the {@link EStructuralFeature} managed by this
-	 * {@link EStructuralFeatureDescriptor} (NOT including the element itself).
-	 */
-	STRICT_SUB_MODEL
+		/** Current project (all models). */
+		PROJECT,
+
+		/** Current model (e.g., ComponentArchitecture). */
+		MODEL,
+
+		/**
+		 * Sub-model below the {@link IModelElement} to which the annotation is attached that
+		 * contains the {@link EStructuralFeature} managed by this
+		 * {@link EStructuralFeatureDescriptor} (including the element itself).
+		 */
+		SUB_MODEL,
+
+		/**
+		 * Sub-model below the {@link IModelElement} to which the annotation is attached that
+		 * contains the {@link EStructuralFeature} managed by this
+		 * {@link EStructuralFeatureDescriptor} (NOT including the element itself).
+		 */
+		STRICT_SUB_MODEL
 	}
 
 	/** {@link EStructuralFeature} managed by this {@link EStructuralFeatureDescriptor}. */
@@ -158,11 +158,8 @@ public class EStructuralFeatureDescriptor {
 	 * {@link EStructuralFeatureDescriptor}.
 	 */
 	public EClassifier getEType(IAnnotatedSpecification specification) {
-		try {
-			return getEStructuralFeature(specification).getEType();
-		} catch(Exception e) {
-			return null;
-		}
+		EStructuralFeature esf = getEStructuralFeature(specification);
+		return esf != null ? esf.getEType() : null;
 	}
 
 	/**