Refactoring

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/terminals/FQNValueConverter.java

@@ -1,37 +0,0 @@
-package org.yakindu.sct.model.stext.terminals;
-
-import org.eclipse.xtext.conversion.ValueConverterException;
-import org.eclipse.xtext.conversion.impl.AbstractIDValueConverter;
-import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
-import org.eclipse.xtext.naming.IQualifiedNameConverter;
-import org.eclipse.xtext.naming.QualifiedName;
-import org.eclipse.xtext.nodemodel.INode;
-
-import com.google.inject.Inject;
-
-public class FQNValueConverter extends AbstractValueConverter<String> {
-	@Inject
-	protected AbstractIDValueConverter idValueConverter;
-	@Inject
-	protected IQualifiedNameConverter converter;
-
-	@Override
-	public String toValue(String string, INode node) throws ValueConverterException {
-		QualifiedName name = converter.toQualifiedName(string);
-		QualifiedName result = QualifiedName.EMPTY;
-		for(String str : name.getSegments()){
-			result = result.append(idValueConverter.toValue(str, node));
-		}
-		return result.toString();
-	}
-
-	@Override
-	public String toString(String value) throws ValueConverterException {
-		QualifiedName name = converter.toQualifiedName(value);
-		QualifiedName result = QualifiedName.EMPTY;
-		for(String str : name.getSegments()){
-			result = result.append(idValueConverter.toString(str));
-		}
-		return result.toString();
-	}
-}

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/terminals/STextValueConverterService.java

@@ -4,26 +4,18 @@ import org.eclipse.xtext.conversion.IValueConverter;
 import org.eclipse.xtext.conversion.ValueConverter;
 import org.yakindu.base.expressions.terminals.ExpressionsValueConverterService;
 
-import com.google.inject.Inject;
-
 public class STextValueConverterService extends ExpressionsValueConverterService{
 	
 	public static final String XID = "XID";
 	public static final String FQN = "FQN";
 	
-	@Inject
-	protected FQNValueConverter fqnConverter;
-	
-	@Inject
-	protected XIDValueConverter xidConverter;
-	
 	@ValueConverter(rule = XID)
 	public IValueConverter<String> XID() {
-		return xidConverter;
+		return qidConverter;
 	}
 	
 	@ValueConverter(rule = FQN)
 	public IValueConverter<String> FQN() {
-		return fqnConverter;
+		return qidConverter;
 	}
 }

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/terminals/XIDValueConverter.java

@@ -1,37 +0,0 @@
-package org.yakindu.sct.model.stext.terminals;
-
-import org.eclipse.xtext.conversion.ValueConverterException;
-import org.eclipse.xtext.conversion.impl.AbstractIDValueConverter;
-import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
-import org.eclipse.xtext.naming.IQualifiedNameConverter;
-import org.eclipse.xtext.naming.QualifiedName;
-import org.eclipse.xtext.nodemodel.INode;
-
-import com.google.inject.Inject;
-
-public class XIDValueConverter extends AbstractValueConverter<String> {
-	@Inject
-	protected AbstractIDValueConverter idValueConverter;
-	@Inject
-	protected IQualifiedNameConverter converter;
-
-	@Override
-	public String toValue(String string, INode node) throws ValueConverterException {
-		QualifiedName name = converter.toQualifiedName(string);
-		QualifiedName result = QualifiedName.EMPTY;
-		for(String str : name.getSegments()){
-			result = result.append(idValueConverter.toValue(str, node));
-		}
-		return result.toString();
-	}
-
-	@Override
-	public String toString(String value) throws ValueConverterException {
-		QualifiedName name = converter.toQualifiedName(value);
-		QualifiedName result = QualifiedName.EMPTY;
-		for(String str : name.getSegments()){
-			result = result.append(idValueConverter.toString(str));
-		}
-		return result.toString();
-	}
-}