فهرست منبع

Create QIDValueConverter.java

reuse converterService
Andreas Mülder 8 سال پیش
والد
کامیت
9c54e20d1b
1فایلهای تغییر یافته به همراه12 افزوده شده و 8 حذف شده
  1. 12 8
      plugins/org.yakindu.base.expressions/src/org/yakindu/base/expressions/terminals/QIDValueConverter.java

+ 12 - 8
plugins/org.yakindu.base.expressions/src/org/yakindu/base/expressions/terminals/QIDValueConverter.java

@@ -8,11 +8,12 @@
  * 
  * 
  * Jonathan Thoene - initial API and implementation
  * Jonathan Thoene - initial API and implementation
  *
  *
-*/
+ */
 package org.yakindu.base.expressions.terminals;
 package org.yakindu.base.expressions.terminals;
 
 
+import org.eclipse.xtext.IGrammarAccess;
+import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.conversion.ValueConverterException;
 import org.eclipse.xtext.conversion.ValueConverterException;
-import org.eclipse.xtext.conversion.impl.AbstractIDValueConverter;
 import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
 import org.eclipse.xtext.conversion.impl.AbstractValueConverter;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -29,16 +30,19 @@ import com.google.inject.Inject;
 public class QIDValueConverter extends AbstractValueConverter<String> {
 public class QIDValueConverter extends AbstractValueConverter<String> {
 
 
 	@Inject
 	@Inject
-	protected AbstractIDValueConverter idValueConverter;
+	protected IValueConverterService converterService;
 	@Inject
 	@Inject
 	protected IQualifiedNameConverter converter;
 	protected IQualifiedNameConverter converter;
+	@Inject
+	protected IGrammarAccess access;
 
 
 	@Override
 	@Override
-	public String toValue(String string, INode node) throws ValueConverterException {
+	public String toValue(String string, INode node)
+			throws ValueConverterException {
 		QualifiedName name = converter.toQualifiedName(string);
 		QualifiedName name = converter.toQualifiedName(string);
 		QualifiedName result = QualifiedName.EMPTY;
 		QualifiedName result = QualifiedName.EMPTY;
-		for(String str : name.getSegments()){
-			result = result.append(idValueConverter.toValue(str, node));
+		for (String str : name.getSegments()) {
+			result = result.append(converterService.toString(str, "ID"));
 		}
 		}
 		return result.toString();
 		return result.toString();
 	}
 	}
@@ -47,8 +51,8 @@ public class QIDValueConverter extends AbstractValueConverter<String> {
 	public String toString(String value) throws ValueConverterException {
 	public String toString(String value) throws ValueConverterException {
 		QualifiedName name = converter.toQualifiedName(value);
 		QualifiedName name = converter.toQualifiedName(value);
 		QualifiedName result = QualifiedName.EMPTY;
 		QualifiedName result = QualifiedName.EMPTY;
-		for(String str : name.getSegments()){
-			result = result.append(idValueConverter.toString(str));
+		for (String str : name.getSegments()) {
+			result = result.append(converterService.toString(str, "ID"));
 		}
 		}
 		return result.toString();
 		return result.toString();
 	}
 	}