Merge pull request #716 from Systems-Modeling/S

ST6RI-893 KerML grammar does not allow constant end features

Author: seidewitz

kerml/src/examples/Simple Tests/Associations.kerml

@@ -12,6 +12,11 @@ package Associations {
 		end [0..*] feature y1 redefines y;
 	}
 
+	assoc struct C {
+		const end [1] feature a;
+		const end feature b;
+	}
+	
 	metaclass M;	
 	assoc XY {
 		end [0..1] feature x : X {

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Associations.kerml.xt

@@ -40,6 +40,11 @@ package Associations {
         end [0..*] feature y1 redefines y;
     }
 
+    assoc struct C {
+        const end [1] feature a;
+        const end feature b;
+    }
+    
     metaclass M;    
     assoc XY {
         // Ensure that the owned cross feature is typed correctly,

org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java

@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext.ide;
 

org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java

@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext.ide.contentassist.antlr;
 

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java

@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext.ui;
 

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java

@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext.ui;
 

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java

@@ -1,12 +1,12 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext.ui.internal;
 
-import com.google.common.collect.Maps;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -29,7 +29,7 @@ public class XtextActivator extends AbstractUIPlugin {
 
 	private static XtextActivator INSTANCE;
 
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
+	private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));
 
 	@Override
 	public void start(BundleContext context) throws Exception {

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java

@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext;
 

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin

@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.34.0
+ * generated by Xtext 2.38.0
  */
 package org.omg.kerml.xtext;