ST6RI-500 Corrected bug created by change to Feature::isOrdered impl.

- Also removed no longer existing file from list of test files for
SysMLRepositorySaveTest.

Author: seidewitz

org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositorySaveTest.java

@@ -32,7 +32,7 @@ public class SysMLRepositorySaveTest extends SysMLRepositorySaveUtil {
 		"02-Parts Interconnection/2a-Parts Interconnection.sysml",
 		"03-Function-based Behavior/3a-Function-based Behavior-1.sysml",
 		"03-Function-based Behavior/3a-Function-based Behavior-2.sysml",
-		"03-Function-based Behavior/3a-Function-based Behavior-5.sysml",
+		"03-Function-based Behavior/3a-Function-based Behavior-3.sysml",
 		"04-Functional Allocation/4a-Functional Allocation.sysml",
 		"05-State-based Behavior/5-State-based Behavior-1.sysml",
 		"05-State-based Behavior/5-State-based Behavior-1a.sysml",
@@ -86,19 +86,19 @@ protected String[] processArgs(String[] args) {
 
 	public static void main(String[] args) {
 		List<String> failedTests = new ArrayList<>();
-		try {
-			String[] args1 = Arrays.copyOf(args, args.length);
-			for (String testFile: TEST_FILES) {
+		String[] args1 = Arrays.copyOf(args, args.length);
+		for (String testFile: TEST_FILES) {
+			try {
 				SysMLRepositorySaveTest test = new SysMLRepositorySaveTest(testFile);
 				test.run(args1);
 				if (!test.isCommitted()) {
 					failedTests.add(testFile);
 				}
-				System.out.println();
+				System.out.println();				
+			} catch (Exception e) {
+				System.out.println("Error: " + e);
+				failedTests.add(testFile);
 			}
-			
-		} catch (Exception e) {
-			System.out.println("Error: " + e);
 		}
 
 		if (failedTests.isEmpty()) {

org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java

@@ -55,7 +55,6 @@
 import org.omg.sysml.lang.sysml.SysMLPackage;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.TypeFeaturing;
-import org.omg.sysml.lang.sysml.impl.FeatureImpl;
 
 public class FeatureUtil {
 
@@ -231,21 +230,6 @@ public static List<Feature> getAllSubsettingFeaturesIn(Type type, Feature subset
 				collect(Collectors.toList());
 	}
 
-	public static boolean checkIsOrdered(FeatureImpl feature, Set<Feature> visited) {
-		if (feature.isOrdered()) {
-			return true;
-		} else {
-			visited.add(feature);
-			for (Feature subsettedFeature: FeatureUtil.getSubsettedFeaturesOf(feature)) {
-				if (subsettedFeature != null && !visited.contains(subsettedFeature) && 
-						checkIsOrdered(((FeatureImpl)subsettedFeature), visited)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
 // Feature values
 
 	public static FeatureValue getValuationFor(Feature feature) {

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FeatureImpl.java

@@ -447,9 +447,24 @@ public void setIsUnique(boolean newIsUnique) {
 	 */
 	@Override
 	public boolean isOrdered() {
-		return FeatureUtil.checkIsOrdered(this, new HashSet<Feature>());
+		return checkIsOrdered(this, new HashSet<Feature>());
 	}
 
+	public static boolean checkIsOrdered(FeatureImpl feature, Set<Feature> visited) {
+		if (feature.isOrdered) {
+			return feature.isOrdered;
+		} else {
+			visited.add(feature);
+			for (Feature subsettedFeature: FeatureUtil.getSubsettedFeaturesOf(feature)) {
+				if (subsettedFeature != null && !visited.contains(subsettedFeature) && 
+						checkIsOrdered(((FeatureImpl)subsettedFeature), visited)) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->