Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbrun2017-05-16 14:51:46 +0000
committerStéphane Bégaudeau2017-05-17 08:26:21 +0000
commit9f8a1d68f6a0b0719ca1713c687e25e0f5eeac36 (patch)
tree20497c28286063843c245416d8c15bc1fd91eb64
parentcda352fe167cd6de2029eee5e62ae11a11d3da44 (diff)
downloadorg.eclipse.sirius-9f8a1d68f6a0b0719ca1713c687e25e0f5eeac36.tar.gz
org.eclipse.sirius-9f8a1d68f6a0b0719ca1713c687e25e0f5eeac36.tar.xz
org.eclipse.sirius-9f8a1d68f6a0b0719ca1713c687e25e0f5eeac36.zip
[510126] use the actual Java type to initialize VariableType
By initializing with a String instead of using the type we are unable later on to pass the actual type to AQL hence falling back to EObject which is wrong in this case. Bug: 510126 Change-Id: I5a126faf0a22328882bd37755e769008f9502f06 Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java
index 7ed16b9d11..f41045e3d3 100644
--- a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java
+++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesInterpretedExpressionQuery.java
@@ -265,8 +265,8 @@ public final class PropertiesInterpretedExpressionQuery extends AbstractInterpre
availableVariables.put(EEFExpressionUtils.INPUT, VariableType.fromJavaClass(SiriusInputDescriptor.class));
if (toolContext instanceof InitialOperation) {
EReference callbackFeature = toolContext.eContainmentFeature();
- VariableType stringType = VariableType.fromString("java.lang.String"); //$NON-NLS-1$
- VariableType booleanType = VariableType.fromString("java.lang.Boolean"); //$NON-NLS-1$
+ VariableType stringType = VariableType.fromJavaClass(String.class);
+ VariableType booleanType = VariableType.fromJavaClass(Boolean.class);
VariableType unkownType = VariableType.fromString(TypeName.EOBJECT_TYPENAME.getCompleteName());
if (callbackFeature == PropertiesPackage.Literals.ABSTRACT_TEXT_DESCRIPTION__INITIAL_OPERATION || callbackFeature == PropertiesPackage.Literals.ABSTRACT_TEXT_AREA_DESCRIPTION__INITIAL_OPERATION) {
availableVariables.put(EEFExpressionUtils.EEFText.NEW_VALUE, stringType);

Back to the top