Просмотр исходного кода

Merge pull request #1609 from Yakindu/proissue_471

Implemented STextValueConverterService
jthoene 8 лет назад
Родитель
Сommit
b880d7a1d8

+ 1 - 0
plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF

@@ -42,5 +42,6 @@ Export-Package: org.yakindu.sct.model.stext,
  org.yakindu.sct.model.stext.stext,
  org.yakindu.sct.model.stext.stext.impl,
  org.yakindu.sct.model.stext.stext.util,
+ org.yakindu.sct.model.stext.terminals,
  org.yakindu.sct.model.stext.validation
 Bundle-ClassPath: .

+ 2 - 2
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/STextRuntimeModule.java

@@ -17,7 +17,6 @@ import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.parser.antlr.IReferableElementsUnloader;
 import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.validation.CompositeEValidator;
-import org.yakindu.base.expressions.terminals.ExpressionsValueConverterService;
 import org.yakindu.base.types.inferrer.ITypeSystemInferrer;
 import org.yakindu.base.types.typesystem.GenericTypeSystem;
 import org.yakindu.base.types.typesystem.ITypeSystem;
@@ -27,6 +26,7 @@ import org.yakindu.sct.model.stext.naming.StextNameProvider;
 import org.yakindu.sct.model.stext.resource.SCTResourceDescriptionStrategy;
 import org.yakindu.sct.model.stext.resource.StextResource;
 import org.yakindu.sct.model.stext.scoping.STextGlobalScopeProvider;
+import org.yakindu.sct.model.stext.terminals.STextValueConverterService;
 
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
@@ -68,7 +68,7 @@ public class STextRuntimeModule extends org.yakindu.sct.model.stext.AbstractSTex
 
 	@Override
 	public Class<? extends org.eclipse.xtext.conversion.IValueConverterService> bindIValueConverterService() {
-		return ExpressionsValueConverterService.class;
+		return STextValueConverterService.class;
 	}
 
 	public void configureFileExtensions(Binder binder) {

+ 21 - 0
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/terminals/STextValueConverterService.java

@@ -0,0 +1,21 @@
+package org.yakindu.sct.model.stext.terminals;
+
+import org.eclipse.xtext.conversion.IValueConverter;
+import org.eclipse.xtext.conversion.ValueConverter;
+import org.yakindu.base.expressions.terminals.ExpressionsValueConverterService;
+
+public class STextValueConverterService extends ExpressionsValueConverterService{
+	
+	public static final String XID = "XID";
+	public static final String FQN = "FQN";
+	
+	@ValueConverter(rule = XID)
+	public IValueConverter<String> XID() {
+		return qidConverter;
+	}
+	
+	@ValueConverter(rule = FQN)
+	public IValueConverter<String> FQN() {
+		return qidConverter;
+	}
+}