Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • af3/kernel
  • diewald/kernel
2 results
Show changes
Commits on Source (5)
AnnotationInstSpec.java b4f2ed47a8984e751e04049de5bdb3cad2c0a933 GREEN AnnotationInstSpec.java b4f2ed47a8984e751e04049de5bdb3cad2c0a933 GREEN
DerivedAnnotationValueProviderBase.java afedd21d3469127bbb20adb34c191b5c9c980f6c GREEN DerivedAnnotationValueProviderBase.java afedd21d3469127bbb20adb34c191b5c9c980f6c GREEN
EStructuralFeatureDescriptor.java 2e14df3830d854bc1693382727b2033b23d0051c GREEN EStructuralFeatureDescriptor.java 9665d0d3040278243dd37591535e411a90fa63bf GREEN
EStructuralFeatureValueProviderBase.java 287facbbce47c16d892bae82a214f64ceeef2263 GREEN EStructuralFeatureValueProviderBase.java 287facbbce47c16d892bae82a214f64ceeef2263 GREEN
IAnnotationValueProvider.java 08e0e5f66dc97865e9ac03e1ac646af332845e14 GREEN IAnnotationValueProvider.java 08e0e5f66dc97865e9ac03e1ac646af332845e14 GREEN
ValueProviderBase.java e4e866840845346ec99a4304048f5327c4890996 GREEN ValueProviderBase.java e4e866840845346ec99a4304048f5327c4890996 GREEN
...@@ -42,25 +42,25 @@ public class EStructuralFeatureDescriptor { ...@@ -42,25 +42,25 @@ public class EStructuralFeatureDescriptor {
* resolved. * resolved.
*/ */
public enum EReferenceScope { public enum EReferenceScope {
/** Current project (all models). */ /** Current project (all models). */
PROJECT, PROJECT,
/** Current model (e.g., ComponentArchitecture). */ /** Current model (e.g., ComponentArchitecture). */
MODEL, MODEL,
/** /**
* Sub-model below the {@link IModelElement} to which the annotation is attached that * Sub-model below the {@link IModelElement} to which the annotation is attached that
* contains the {@link EStructuralFeature} managed by this * contains the {@link EStructuralFeature} managed by this
* {@link EStructuralFeatureDescriptor} (including the element itself). * {@link EStructuralFeatureDescriptor} (including the element itself).
*/ */
SUB_MODEL, SUB_MODEL,
/** /**
* Sub-model below the {@link IModelElement} to which the annotation is attached that * Sub-model below the {@link IModelElement} to which the annotation is attached that
* contains the {@link EStructuralFeature} managed by this * contains the {@link EStructuralFeature} managed by this
* {@link EStructuralFeatureDescriptor} (NOT including the element itself). * {@link EStructuralFeatureDescriptor} (NOT including the element itself).
*/ */
STRICT_SUB_MODEL STRICT_SUB_MODEL
} }
/** {@link EStructuralFeature} managed by this {@link EStructuralFeatureDescriptor}. */ /** {@link EStructuralFeature} managed by this {@link EStructuralFeatureDescriptor}. */
...@@ -158,11 +158,8 @@ public class EStructuralFeatureDescriptor { ...@@ -158,11 +158,8 @@ public class EStructuralFeatureDescriptor {
* {@link EStructuralFeatureDescriptor}. * {@link EStructuralFeatureDescriptor}.
*/ */
public EClassifier getEType(IAnnotatedSpecification specification) { public EClassifier getEType(IAnnotatedSpecification specification) {
try { EStructuralFeature esf = getEStructuralFeature(specification);
return getEStructuralFeature(specification).getEType(); return esf != null ? esf.getEType() : null;
} catch(Exception e) {
return null;
}
} }
/** /**
......