renamed DefaultTypeSystem to GenericTypeSystem

plugins/org.yakindu.base.expressions/emf-gen/org/yakindu/base/expressions/expressions/impl/ExpressionsFactoryImpl.java

@@ -8,7 +8,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.yakindu.base.expressions.expressions.*;
 import org.yakindu.base.expressions.expressions.AdditiveOperator;
 import org.yakindu.base.expressions.expressions.AssignmentExpression;
 import org.yakindu.base.expressions.expressions.AssignmentOperator;

plugins/org.yakindu.base.expressions/src/org/yakindu/base/expressions/inferrer/ExpressionsTypeInferrer.java

@@ -10,12 +10,12 @@
  */
 package org.yakindu.base.expressions.inferrer;
 
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.BOOLEAN;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.INTEGER;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.NULL;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.REAL;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.STRING;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.VOID;
+import static org.yakindu.base.types.typesystem.ITypeSystem.BOOLEAN;
+import static org.yakindu.base.types.typesystem.ITypeSystem.INTEGER;
+import static org.yakindu.base.types.typesystem.ITypeSystem.NULL;
+import static org.yakindu.base.types.typesystem.ITypeSystem.REAL;
+import static org.yakindu.base.types.typesystem.ITypeSystem.STRING;
+import static org.yakindu.base.types.typesystem.ITypeSystem.VOID;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.xtext.EcoreUtil2;

plugins/org.yakindu.base.types.edit/src/org/yakindu/base/types/provider/OperationItemProvider.java

@@ -12,10 +12,12 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.yakindu.base.types.Operation;
+import org.yakindu.base.types.Parameter;
 import org.yakindu.base.types.TypesFactory;
 import org.yakindu.base.types.TypesPackage;
 
@@ -94,17 +96,22 @@ public class OperationItemProvider
 	}
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Operation)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Operation_type") :
-			getString("_UI_Operation_type") + " " + label;
+		Operation operation = (Operation)object;
+		StringBuilder builder = new StringBuilder(operation.getName());
+		builder.append("(");
+		EList<Parameter> parameters = operation.getParameters();
+		for (Parameter parameter : parameters) {
+			builder.append(parameter.getName());
+			builder.append(" : " );
+			builder.append(parameter.getType().getName());
+		}
+		builder.append(")");
+
+		return builder.toString();
 	}
 
 	/**

plugins/org.yakindu.base.types/src/org/yakindu/base/types/typesystem/AbstractTypeSystem.java

@@ -42,7 +42,7 @@ public abstract class AbstractTypeSystem implements ITypeSystem {
 	protected Map<Type, Type> conversionRegistry = new HashMap<Type, Type>();
 
 	protected abstract void initBuiltInTypes();
-
+	
 	protected Resource resource;
 
 	public AbstractTypeSystem() {

plugins/org.yakindu.base.types/src/org/yakindu/base/types/typesystem/DefaultTypeSystem.java

@@ -18,14 +18,7 @@ import com.google.inject.Singleton;
  * 
  */
 @Singleton
-public class DefaultTypeSystem extends AbstractTypeSystem {
-
-	public static final String NULL = "null";
-	public static final String STRING = "string";
-	public static final String REAL = "real";
-	public static final String INTEGER = "integer";
-	public static final String BOOLEAN = "boolean";
-	public static final String VOID = "void";
+public class GenericTypeSystem extends AbstractTypeSystem {
 
 	@Override
 	protected void initBuiltInTypes() {

plugins/org.yakindu.base.types/src/org/yakindu/base/types/typesystem/ITypeSystem.java

@@ -24,8 +24,15 @@ import com.google.inject.ImplementedBy;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-@ImplementedBy(DefaultTypeSystem.class)
+@ImplementedBy(GenericTypeSystem.class)
 public interface ITypeSystem {
+	
+	public static final String STRING = "string";
+	public static final String REAL = "real";
+	public static final String INTEGER = "integer";
+	public static final String BOOLEAN = "boolean";
+	public static final String VOID = "void";
+	public static final String NULL = "null";
 
 	public Collection<Type> getTypes(EObject context);