From 6ffb896586919dd0017f0d36b6abad500eb8edc8 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Thu, 12 Nov 2015 10:10:48 +0100 Subject: [PATCH] [grammar][serializer] Use the EString from the resource set --- .../org/eclipse/xtext/xtext/XtextTransientValueService.java | 3 +-- .../org/eclipse/xtext/xtext/XtextTransientValueService2.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java index 4ff22c34f..d2de514a0 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService.java @@ -10,7 +10,6 @@ package org.eclipse.xtext.xtext; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.xtext.AbstractMetamodelDeclaration; import org.eclipse.xtext.AbstractRule; import org.eclipse.xtext.CrossReference; @@ -54,7 +53,7 @@ public class XtextTransientValueService extends DefaultTransientValueService { } } else if (rule instanceof TerminalRule) { final TypeRef returnType = rule.getType(); - return ((TerminalRule) rule).isFragment() || returnType == null || EcorePackage.eINSTANCE.getEString().equals(rule.getType().getClassifier()); + return ((TerminalRule) rule).isFragment() || returnType == null || GrammarUtil.findEString(GrammarUtil.getGrammar(owner)).equals(rule.getType().getClassifier()); } } else if (feature == XtextPackage.eINSTANCE.getCrossReference_Terminal()) { diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java index 5189b48b7..210903a9e 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextTransientValueService2.java @@ -65,7 +65,7 @@ public class XtextTransientValueService2 extends TransientValueService { return YES; } } - if (EcorePackage.eINSTANCE.getEString().equals(rule.getType().getClassifier())) + if (GrammarUtil.findEString(GrammarUtil.getGrammar(owner)).equals(rule.getType().getClassifier())) return PREFERABLY; return NO; }