From 858a3ee21dd91451fee21283b66fc81516e08ce8 Mon Sep 17 00:00:00 2001 From: Simon Barner <barner@fortiss.org> Date: Wed, 8 May 2019 10:47:05 +0200 Subject: [PATCH] Do not reset annotation value in case setting an invalid string fails Issue-Ref: 3696 Issue-Url: https://af3-developer.fortiss.org/issues/3696 Signed-off-by: Simon Barner <barner@fortiss.org> --- .../org/fortiss/tooling/base/annotation/valueprovider/.ratings | 2 +- .../valueprovider/EStructuralFeatureValueProviderBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/.ratings b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/.ratings index 084b2f7c6..56b91d5d2 100644 --- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/.ratings +++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/.ratings @@ -1,6 +1,6 @@ AnnotationInstSpec.java b4f2ed47a8984e751e04049de5bdb3cad2c0a933 GREEN DerivedAnnotationValueProviderBase.java 15da44b7b92b7fd351aa48422ff5957a2ce34e35 GREEN EStructuralFeatureDescriptor.java 2e14df3830d854bc1693382727b2033b23d0051c GREEN -EStructuralFeatureValueProviderBase.java 7e3f41a7e5c22fda63058fb5cd1c8036df0e8a3f GREEN +EStructuralFeatureValueProviderBase.java 71c418486bc6c46bc468e18c92b21f6b537706db YELLOW IAnnotationValueProvider.java d093cb522e7c484420331f0c77690bebe7e131b4 GREEN ValueProviderBase.java e4e866840845346ec99a4304048f5327c4890996 GREEN diff --git a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java index 7e3f41a7e..71c418486 100644 --- a/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java +++ b/org.fortiss.tooling.base/src/org/fortiss/tooling/base/annotation/valueprovider/EStructuralFeatureValueProviderBase.java @@ -163,7 +163,7 @@ public abstract class EStructuralFeatureValueProviderBase<T extends IAnnotatedSp specification.eSet(structuralFeature, eFactory.createFromString(eAttributeType, value)); } catch(Exception e) { - specification.eSet(structuralFeature, null); + // Keep previous value } } else { throw new Exception( -- GitLab