ST6RI-901 Updated implicit specialization for OccurrenceUsage/PortUsage.

So checkFeatureObjectSpecialization and
checkFeatureSubobjectSpecialization are properly satisfied when they
apply.

Author: seidewitz

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

@@ -50,14 +50,23 @@ public void postProcess() {
 	// Implicit Generalization
 
 	/**
+	 * @satisfies checkFeatureObjectSpecialization
+	 * @satisfies checkFeatureSubobjectSpecialization
+	 * @satisfies checkFeatureDataValueSpecialization
 	 * @satisfies checkOccurrenceUsageSnapshotSpecialization
 	 * @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
 	 * @satisfies checkOccurrenceUsageTimeSliceSpecialization
 	 */
 	@Override
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
-		if (isSuboccurrence()) {
+		if (hasDataType()) {
+			addDefaultGeneralType("dataValue");
+		}
+		if (hasStructureType()) {
+			addDefaultGeneralType(isSubobject()? "subobject": "object");
+		}
+		else if (isSuboccurrence()) {
 			addDefaultGeneralType("suboccurrence");
 		}
 		PortionKind portionKind = getTarget().getPortionKind();

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

@@ -39,6 +39,14 @@ public PortUsage getTarget() {
 
 	// Implicit Generalization
 
+	@Override
+	public void addDefaultGeneralType() {
+		super.addDefaultGeneralType();
+		if (isStructureOwnedComposite()) {
+			addDefaultGeneralType("subobject");
+		}
+	}
+	
 	/**
 	 * @satisfies checkPortUsageOwnedPortSpecialization
 	 * @satisfies checkPortUsageSubportSpecialization