ST6RI-864 Updated handling of result typing for IndexExpressions.

- Fixed if test to correctly check specialization by seqResult.
- Generalized if test so that result typing is added for any seqResult
that does not have a Collection type.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java

@@ -32,8 +32,7 @@
 
 public class IndexExpressionAdapter extends OperatorExpressionAdapter {
 
-	public static final String ARRAY_TYPE = "Collections::Array";
-	public static final String SCALAR_VALUE_TYPE = "ScalarValues::ScalarValue";
+	public static final String COLLECTIONS_TYPE = "Collections::Collection";
 
 	public IndexExpressionAdapter(IndexExpression element) {
 		super(element);
@@ -55,16 +54,14 @@ protected void addResultTyping() {
 			Expression seqArgument = arguments.get(0);
 			ElementUtil.transform(seqArgument);
 			Feature seqResult = seqArgument.getResult();
-			Type arrayType = getLibraryType(ARRAY_TYPE);
-			Type scalarValueType = getLibraryType(SCALAR_VALUE_TYPE);
+			Type collectionType = getLibraryType(COLLECTIONS_TYPE);
 			/*
 			 * TODO: Update checkIndexExpressionResultSpecialization
-			 * See KERML11-69.
-    		 * 
-    		 * TODO: Generalize to handle all types other than Collection types?
-    		 * TODO: Replace target with seqResult in specialization checks.
-			 */
-			if (!TypeUtil.specializes(target, arrayType) || TypeUtil.specializes(target, scalarValueType)) {
+			 * 
+			 * OCL currently only checks for Array type, not any Collection type.
+			 * See KERML11-69
+ 			 */
+			if (!TypeUtil.specializes(seqResult, collectionType)) {
 				Feature resultFeature = target.getResult();
 				if (resultFeature != null && seqResult != null) {
 					TypeUtil.addImplicitGeneralTypeTo(resultFeature, SysMLPackage.eINSTANCE.getSubsetting(), seqResult);