KERML_-57/SYSML2_-510 Updated reflective model generation per resolution

- Also updated for proper KerML and SysML keywords.
- Results in no actual change to SysML.sysml over updates already done
for ST6RI-827.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/generation/MOF2KerMLText.xtend

@@ -122,7 +122,7 @@ class MOF2KerMLText {
 	}
 
 	def toMetaclass(org.eclipse.uml2.uml.Class class_) {
-		toMetaclass(class_, "metaclass")
+		class_.toMetaclass("metaclass")
 	}
 
 	def toMetaclass(org.eclipse.uml2.uml.Class class_, String keyword) {
@@ -158,12 +158,13 @@ class MOF2KerMLText {
 	}
 
 	def toFeature(org.eclipse.uml2.uml.Property property) {
-		toFeature(property, property.isComposite, "feature")
+		val keyword = '''«IF property.isComposite»composite «ENDIF»«IF property.readOnly»const «ELSE»var «ENDIF»feature'''
+		property.toFeature(keyword)
 	}
 
-	def toFeature(org.eclipse.uml2.uml.Property property, boolean isComposite, String keyword) {
+	def toFeature(org.eclipse.uml2.uml.Property property, String keyword) {
 		'''
-		«IF property.derivedUnion»abstract «ENDIF»«IF isComposite»composite «ENDIF»«IF property.readOnly»readonly «ENDIF»«IF property.derived»derived «ENDIF»«keyword» «nameOf(property)» : «property.type.toTypeName»«property.toMultiplicity»«property.toSubsets»«property.toRedefines»;
+		«IF property.derived»derived «ENDIF»«IF property.derivedUnion»abstract «ENDIF»«keyword» «nameOf(property)» : «property.type.toTypeName»«property.toMultiplicity»«property.toSubsets»«property.toRedefines»;
 		'''
 	}
 
@@ -194,16 +195,16 @@ class MOF2KerMLText {
 
 	def String getReservedWords() {
 		// Note: Every word must be preceded and followed by a space.
-	   " about abstract alias all and as assign assoc behavior binding bool by chains 
-		 class classifier comment composite conjugate conjugates conjugation connector 
-		 datatype default derived differences disjoining disjoint doc element else end 
-		 expr false feature featured featuring filter first flow for from function 
-		 hastype if intersects implies import in inout interaction inv inverse 
-		 inverting istype language locale member metaclass metadata multiplicity namespace 
-		 nonunique not null of or ordered out package portion predicate private 
-		 protected public readonly references redefines redefinition relationship rep 
-		 return specialization specializes step struct subclassifier subset subsets 
-		 subtype succession then to true type typed typing unions xor "
+	   " about abstract alias all and as assoc behavior binding bool by chains class 
+		 classifier comment composite conjugate conjugates conjugation connector const 
+		 crosses datatype default dependency derived differences disjoining disjoint doc 
+		 else end expr false feature featured featuring filter first flow for from 
+		 function hastype if implies import in inout interaction intersects inv inverse 
+		 inverting istype language library locale member meta metaclass metadata 
+		 multiplicity namespace nonunique not null of or ordered out package portion 
+		 predicate private protected public redefines redefinition references rep return 
+		 specialization specializes standard step struct subclassifier subset subsets 
+		 subtype succession then to true type typed typing unions var xor "
 	}
 
 	def toTypeName(Type type) {

org.omg.sysml/src/org/omg/sysml/generation/MOF2SysMLText.xtend

@@ -38,32 +38,32 @@ class MOF2SysMLText extends MOF2KerMLText {
 	}
 
 	override toMetaclass(org.eclipse.uml2.uml.Class class_) {
-		toMetaclass(class_, "metadata def")
+		class_.toMetaclass("metadata def")
 	}
 
 	override toFeature(org.eclipse.uml2.uml.Property property) {
 		if (property.type instanceof DataType) {
-			toFeature(property, false, "attribute")
+			property.toFeature("attribute")
 		} else {
-			toFeature(property, false, if (property.isComposite) "item" else "ref item")
+			val keyword = '''«IF property.readOnly»constant «ENDIF»«IF !property.isComposite»ref «ENDIF»item'''
+			property.toFeature(keyword)
 		}
 	}
 
 	override String getReservedWords() {
 		// Note: Every word must be preceded and followed by a space.
-	   " about abstract accept action actor after alias all allocate allocation 
-		 analysis and as assign assert assume at attribute bind binding by 
-		 calc case comment concern connect connection constraint decide def default
-		 defined dependency derived do doc else end entry enum event exhibit 
-		 exit expose filter first flow for fork frame from hastype if implies 
-		 import in include individual inout interface istype item join language 
-		 library locale loop merge message meta metadata nonunique not objective 
-		 occurrence of or ordered out package parallel part perform port private 
-		 protected public readonly redefines ref references render rendering rep 
-		 require requirement return satisfy send snapshot specializes stakeholder 
-		 standard state subject subsets succession terminate then timeslice to 
-		 transition until use variant variation verification verify via view 
-		 viewpoint when while xor "
+	   " about abstract accept action actor after alias all allocate allocation analysis 
+		 and as assert assign assume at attribute bind binding by calc case comment 
+		 concern connect connection constant constraint crosses decide def default 
+		 defined dependency derived do doc else end entry enum event exhibit exit expose 
+		 false filter first flow for fork frame from hastype if implies import in include 
+		 individual inout interface istype item join language library locale loop merge 
+		 message meta metadata nonunique not null objective occurrence of or ordered out 
+		 package parallel part perform port private protected public redefines ref 
+		 references render rendering rep require requirement return satisfy send snapshot 
+		 specializes stakeholder standard state subject subsets succession terminate then 
+		 timeslice to transition true until use variant variation verification verify via 
+		 view viewpoint when while xor "
 	}
 
 	static def void main(String[] args) {