Merge pull request #5 from ModelDriven/feature/ST5AS-23

feature/ST5AS-23

Author: ivan-gomes

app/org/omg/sysml/metamodel/Association.java

@@ -5,9 +5,9 @@
 import java.util.Set;
 
 public interface Association extends Class, Relationship, MofObject {
-    Collection<? extends Category> getRelatedType();
-
-    List<? extends EndFeatureMembership> getOwnedEndFeatureMembership();
+    Collection<? extends Type> getRelatedType();
 
     Connector getOwningConnector();
+
+    Collection<? extends Feature> getAssociationEnd();
 }

app/org/omg/sysml/metamodel/AtomicInteraction.java

@@ -5,5 +5,5 @@
 import java.util.Set;
 
 public interface AtomicInteraction extends MofObject {
-    Collection<? extends Class> getItemType();
+    Collection<? extends Classifier> getItemType();
 }

app/org/omg/sysml/metamodel/Behavior.java

@@ -4,10 +4,8 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Behavior extends Class, MofObject {
+public interface Behavior extends Classifier, MofObject {
     Collection<? extends Step> getStep();
 
-    Collection<? extends Feature> getInvolvesFeature();
-
     Collection<? extends Parameter> getParameter();
 }

app/org/omg/sysml/metamodel/Class.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Class extends Category, MofObject {
-    Collection<? extends Superclassing> getOwnedSuperclassing();
+public interface Class extends Classifier, MofObject {
+
 }

app/org/omg/sysml/metamodel/Classifier.java

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface Classifier extends Type, MofObject {
+    Collection<? extends Superclassing> getOwnedSuperclassing();
+}

app/org/omg/sysml/metamodel/Connector.java

@@ -7,11 +7,11 @@
 public interface Connector extends Feature, Relationship, MofObject {
     Collection<? extends Feature> getRelatedFeature();
 
-    Association getAssociation();
+    Collection<? extends Association> getAssociation();
 
     Boolean getIsDirected();
 
-    Association getOwnedAssociationType();
+    Collection<? extends Association> getOwnedAssociationType();
 
     Collection<? extends Feature> getConnectorEnd();
 }

app/org/omg/sysml/metamodel/DataType.java

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface DataType extends Classifier, MofObject {
+
+}

app/org/omg/sysml/metamodel/EndFeatureMembership.java

@@ -5,5 +5,5 @@
 import java.util.Set;
 
 public interface EndFeatureMembership extends FeatureMembership, MofObject {
-    Association getOwningAssociation();
+
 }

app/org/omg/sysml/metamodel/Feature.java

@@ -4,18 +4,18 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Feature extends Category, MofObject {
-    Collection<? extends Category> getReferencedType();
+public interface Feature extends Type, MofObject {
+    Collection<? extends Type> getReferencedType();
 
-    Category getOwningCategory();
+    Type getOwningType();
 
     Boolean getIsUnique();
 
     Boolean getIsOrdered();
 
-    Collection<? extends Category> getType();
+    Collection<? extends Type> getType();
 
-    Collection<? extends Category> getOwnedType();
+    Collection<? extends Type> getOwnedType();
 
     Collection<? extends Redefinition> getOwnedRedefinition();
 
@@ -31,5 +31,7 @@ public interface Feature extends Category, MofObject {
 
     Collection<? extends FeatureTyping> getTyping();
 
+    Boolean getIsEnd();
+
     Boolean getIsNonunique();
 }

app/org/omg/sysml/metamodel/FeatureDirectionKind.java

@@ -2,6 +2,6 @@
 
 public enum FeatureDirectionKind {
     IN,
-    OUT,
-    INOUT
+    INOUT,
+    OUT
 }