SYSML21-322 Fixed diamond inheritance problems in Systems Library.

Mostly, this involved just adding appropriate explicit redefinitions.
But:

- Flows was fixed in part by updating Connections::BinaryConnection and
Transfers::FlowTransferBefore to re-order specializations.

- Usages typed by metadata definitions in SysML were mostly fixed by the
fix to Metadata. However, this did not fix usages typed by KerML
metaobjects. To consistently resolve all problems, "subsets
Metadata::metadataItems" was added to all metadata/metaobject item
usages.

- Views was fixed by adding a redefinition of "this" to
View::viewpointConformance::viewpointSatisfactions, but with a default
of "that.that" (which is basically the default value of "this" for
View::viewpointSatisfactions; but see also SYSML21-323).

Author: seidewitz

sysml.library/Kernel Libraries/Kernel Semantic Library/Transfers.kerml

@@ -167,7 +167,7 @@ standard library package Transfers {
         private succession self then target;
     }
 
-    interaction FlowTransferBefore specializes FlowTransfer, TransferBefore intersects FlowTransfer, TransferBefore {
+    interaction FlowTransferBefore specializes TransferBefore, FlowTransfer intersects FlowTransfer, TransferBefore {
         doc
         /*
          * FlowTransferBefore is a FlowTransfer that is also a TransferBefore. 

sysml.library/Systems Library/Actions.sysml

@@ -190,7 +190,9 @@ standard library package Actions {
 		 */
 
 		in :>> payload [0..*];
-	    ref sentMessage :>> sentTransfer: MessageTransfer, MessageAction;
+	    ref sentMessage :>> sentTransfer: MessageTransfer, MessageAction {
+	        in :>> MessageTransfer::payload, MessageAction::payload;
+	    }
 	}
 
 	abstract action sendActions: SendAction[0..*] nonunique :> actions, sendPerformances {
@@ -207,7 +209,9 @@ standard library package Actions {
 		 * of a designated receiver Occurrence, providing its payload as output.
 		 */
 		inout :>> payload;
-		ref acceptedMessage :>> acceptedTransfer: MessageTransfer, MessageAction;
+		ref acceptedMessage :>> acceptedTransfer: MessageTransfer, MessageAction {
+            in :>> MessageTransfer::payload, MessageAction::payload;
+        }
 	}
 
 	action def AcceptAction :> AcceptMessageAction {
@@ -330,7 +334,9 @@ standard library package Actions {
 		 */
 
 		in transitionLinkSource : Action :>> TransitionPerformance::transitionLinkSource;
-		ref acceptedMessage : MessageTransfer, MessageAction :>> trigger;
+		ref acceptedMessage : MessageTransfer, MessageAction :>> trigger {
+            in :>> MessageTransfer::payload, MessageAction::payload;
+        }
 
 		ref receiver :>> triggerTarget;
 

sysml.library/Systems Library/Connections.sysml

@@ -32,7 +32,7 @@ standard library package Connections {
          */
     }
 
-    abstract connection def BinaryConnection :> Connection, BinaryLinkObject {
+    abstract connection def BinaryConnection :> BinaryLinkObject, Connection {
         doc
         /*
          * BinaryConnection is the most general class of binary links between two things 

sysml.library/Systems Library/Flows.sysml

@@ -81,7 +81,7 @@ standard library package Flows {
          * It is the base type for FlowUsages that identify their source output and
          * target input.
          */
-        
+         
         end occurrence source: Occurrence :>> Message::source, FlowTransfer::source;
         end occurrence target: Occurrence :>> Message::target, FlowTransfer::target;
     }
@@ -92,6 +92,8 @@ standard library package Flows {
          * SuccessionFlow is a subclass of flowss that appen after their source and 
          * before their target. It is the base type for all SuccessionFlowUsages.
          */
+         
+        ref self : SuccessionFlow :>> Flow::self, FlowTransferBefore::self;
 
         end occurrence source: Occurrence :>> Flow::source, FlowTransferBefore::source;
         end occurrence target: Occurrence :>> Flow::target, FlowTransferBefore::target;

sysml.library/Systems Library/Items.sysml

@@ -72,12 +72,14 @@ standard library package Items {
 		}
 
 		item boundingShapes : StructuredSpaceObject [0..*] :> envelopingShapes {
-		doc
+            doc
 			/*
 			 * envelopingShapes that are structured space objects with every face or every edge
 			 * intersecting this Item.
 			 */		
-
+            
+            attribute :>> StructuredSpaceObject::innerSpaceDimension, envelopingShapes::innerSpaceDimension;
+            
 			item boundingShape: Item :>> self;
 
 			item :>> faces {

sysml.library/Systems Library/Metadata.sysml

@@ -16,6 +16,8 @@ doc
 		 * MetadataItem is the most general class of Items that represent Metaobjects. 
 		 * MetadataItem is the base type of all MetadataDefinitions.
 		 */
+		 
+		 ref self : MetadataItem redefines Metaobject::self, Item::self;
 	}
 
 	abstract item metadataItems : MetadataItem[0..*] :> metaobjects, items {

sysml.library/Systems Library/Ports.sysml

@@ -39,6 +39,9 @@ standard library package Ports {
             /* 
              * The target of each of the outgoingTransfersFromSelf of a Port must be an interfacingPort.
              */
+             
+             end ref source;
+             end ref target;
         }
     }
 

sysml.library/Systems Library/SysML.sysml

@@ -14,21 +14,21 @@ standard library package Views {
 		ref view :>> self : View;
 
 		abstract ref view subviews : View[0..*] :> views {
-		doc
-		/*
-		 * Other Views that are used in the rendering of this View.
-		 */
+    		doc
+    		/*
+    		 * Other Views that are used in the rendering of this View.
+    		 */
 		}
 
 		abstract ref rendering viewRendering : Rendering[0..1] {
-		doc
+            doc
 			/*
 			 * The rendering of this View.
 			 */
 		}
 
 		viewpoint viewpointSatisfactions : ViewpointCheck[0..*] :> viewpointChecks, checkedConstraints {
-		doc
+            doc
 			/*
 			 * Checks that the View satisfies all required ViewpointUsages.
 			 */
@@ -39,12 +39,13 @@ standard library package Views {
 			/*
 			 * An assertion that all viewpointSatisfactions are true.
 			 */
-		
+			 
 			require viewpointSatisfactions {
 				doc
 				/*
 				 * The required ViewpointChecks.
 				 */
+                ref :>> ownedPerformances::this, subperformances::this default that.that;
 			}
 		}
 	}