ArgumentSorter should not resolve parameter proxies (#2002)

plugins/org.yakindu.base.expressions/emf-gen/org/yakindu/base/expressions/expressions/util/ArgumentSorter.java

@@ -1,59 +1,64 @@
-/**
- * Copyright (c) 2017 itemis AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 	itemis AG - initial API and implementation
- * 
- */
-package org.yakindu.base.expressions.expressions.util;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.yakindu.base.expressions.expressions.Argument;
-import org.yakindu.base.expressions.expressions.Expression;
-import org.yakindu.base.types.Operation;
-import org.yakindu.base.types.Parameter;
-
-/**
- * 
- * @author andreas muelder - Initial contribution and API
- * 
- */
-public class ArgumentSorter {
-
-	public static EList<Expression> getOrderedExpressions(List<Argument> arguments, Operation operation) {
-		Expression[] result = new Expression[arguments.size()];
-		for (int index = 0; index < arguments.size(); index++) {
-			Argument argument = arguments.get(index);
-			if (argument.getParameter() == null)
-				result[index] = argument.getValue();
-			else {
-				// operation.getParameters().indexOf(argument.getParameter() can
-				// not be used here since it uses object.equals instead of
-				// EcoreUtil.equals.)
-				for (Parameter param : operation.getParameters()) {
-					if (param.getName().equals(argument.getParameter().getName())) {
-						int parameterIndex = operation.getParameters().indexOf(param);
-						if (parameterIndex < result.length)
-							result[parameterIndex] = argument.getValue();
-						break;
-					}
-				}
-			}
-		}
-
-		EList<Expression> resultAsList = new BasicEList<Expression>();
-		for (int i = 0; i < result.length; i++) {
-			Expression expression = result[i];
-			if (expression != null)
-				resultAsList.add(expression);
-		}
-		return resultAsList;
-	}
-}
+/**
+ * Copyright (c) 2017 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * 	itemis AG - initial API and implementation
+ * 
+ */
+package org.yakindu.base.expressions.expressions.util;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
+import org.yakindu.base.expressions.expressions.Argument;
+import org.yakindu.base.expressions.expressions.Expression;
+import org.yakindu.base.expressions.expressions.ExpressionsPackage;
+import org.yakindu.base.types.Operation;
+import org.yakindu.base.types.Parameter;
+
+/**
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public class ArgumentSorter {
+
+	public static EList<Expression> getOrderedExpressions(List<Argument> arguments, Operation operation) {
+		Expression[] result = new Expression[arguments.size()];
+		for (int index = 0; index < arguments.size(); index++) {
+			Argument argument = arguments.get(index);
+			List<INode> nodes = NodeModelUtils.findNodesForFeature(argument,
+					ExpressionsPackage.Literals.ARGUMENT__PARAMETER);
+			if (nodes.isEmpty()) {
+				result[index] = argument.getValue();
+			} else {
+				// operation.getParameters().indexOf(argument.getParameter() can
+				// not be used here since it uses object.equals instead of
+				// EcoreUtil.equals.)
+				for (Parameter param : operation.getParameters()) {
+					if (param.getName().equals(nodes.get(0).getText())) {
+						int parameterIndex = operation.getParameters().indexOf(param);
+						if (parameterIndex < result.length)
+							result[parameterIndex] = argument.getValue();
+						break;
+					}
+				}
+			}
+		}
+
+		EList<Expression> resultAsList = new BasicEList<Expression>();
+		for (int i = 0; i < result.length; i++) {
+			Expression expression = result[i];
+			if (expression != null)
+				resultAsList.add(expression);
+		}
+		return resultAsList;
+	}
+}

plugins/org.yakindu.base.types/src-gen/org/yakindu/base/types/impl/OperationImpl.java

@@ -272,7 +272,10 @@ public class OperationImpl extends DeclarationImpl implements Operation {
 	
 	@Override
 	public String getId() {
-		StringBuilder builder = new StringBuilder(super.getId());
+		String superId = super.getId();
+		if(superId == null)
+			return null;
+		StringBuilder builder = new StringBuilder(superId);
 		EList<Parameter> parameters = getParameters();
 		for (Parameter parameter : parameters) {
 			if(parameter.getType() == null || parameter.getType().getName() == null)