Merge branch 'release/2021-06-rc2'

Systems-Modeling · Jul 29, 2021 · 2686861 · 2686861
2 parents 9e28b48 + eeebfec
commit 2686861
Show file tree

Hide file tree

Showing 355 changed files with 3,392 additions and 3,137 deletions.
diff --git a/app/org/omg/sysml/metamodel/Disjoining.java b/app/org/omg/sysml/metamodel/Disjoining.java
@@ -29,4 +29,6 @@ public interface Disjoining extends Relationship, MofObject {
     Type getTypeDisjoined();
 
     Type getDisjoiningType();
+
+    Type getOwningType();
 }
diff --git a/app/org/omg/sysml/metamodel/EndFeatureMembership.java b/app/org/omg/sysml/metamodel/EndFeatureMembership.java
@@ -26,5 +26,5 @@
 import java.util.Set;
 
 public interface EndFeatureMembership extends FeatureMembership, MofObject {
-
+    Feature getOwnedMemberFeature();
 }
diff --git a/app/org/omg/sysml/metamodel/Type.java b/app/org/omg/sysml/metamodel/Type.java
@@ -60,7 +60,7 @@ public interface Type extends Namespace, MofObject {
 
     Collection<? extends Type> getDisjointType();
 
-    Collection<? extends Disjoining> getDisjoiningTypeDisjoining();
-
     List<? extends Feature> getDirectedFeature();
+
+    Collection<? extends Disjoining> getOwnedDisjoining();
 }
diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java
@@ -266,30 +266,6 @@ public void setDirection(FeatureDirectionKind direction) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("disjoiningTypeDisjoining")
-    private Collection<Disjoining> disjoiningTypeDisjoining;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AcceptActionUsage_disjoiningTypeDisjoining",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Disjoining> getDisjoiningTypeDisjoining() {
-        if (disjoiningTypeDisjoining == null) {
-            disjoiningTypeDisjoining = new ArrayList<>();
-        }
-        return disjoiningTypeDisjoining;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
-    public void setDisjoiningTypeDisjoining(Collection<Disjoining> disjoiningTypeDisjoining) {
-        this.disjoiningTypeDisjoining = disjoiningTypeDisjoining;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("disjointType")
     private Collection<Type> disjointType;
@@ -1770,6 +1746,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedDisjoining")
+    private Collection<Disjoining> ownedDisjoining;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AcceptActionUsage_ownedDisjoining",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Disjoining> getOwnedDisjoining() {
+        if (ownedDisjoining == null) {
+            ownedDisjoining = new ArrayList<>();
+        }
+        return ownedDisjoining;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
+    public void setOwnedDisjoining(Collection<Disjoining> ownedDisjoining) {
+        this.ownedDisjoining = ownedDisjoining;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedElement")
     private List<Element> ownedElement;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java
@@ -170,30 +170,6 @@ public void setDirectedUsage(List<Usage> directedUsage) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("disjoiningTypeDisjoining")
-    private Collection<Disjoining> disjoiningTypeDisjoining;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionDefinition_disjoiningTypeDisjoining",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Disjoining> getDisjoiningTypeDisjoining() {
-        if (disjoiningTypeDisjoining == null) {
-            disjoiningTypeDisjoining = new ArrayList<>();
-        }
-        return disjoiningTypeDisjoining;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
-    public void setDisjoiningTypeDisjoining(Collection<Disjoining> disjoiningTypeDisjoining) {
-        this.disjoiningTypeDisjoining = disjoiningTypeDisjoining;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("disjointType")
     private Collection<Type> disjointType;
@@ -1011,6 +987,32 @@ public void setOwnedConstraint(List<ConstraintUsage> ownedConstraint) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedDisjoining")
+    private Collection<Disjoining> ownedDisjoining;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "ActionDefinition_ownedDisjoining",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Disjoining> getOwnedDisjoining() {
+        if (ownedDisjoining == null) {
+            ownedDisjoining = new ArrayList<>();
+        }
+        return ownedDisjoining;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
+    public void setOwnedDisjoining(Collection<Disjoining> ownedDisjoining) {
+        this.ownedDisjoining = ownedDisjoining;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedElement")
     private List<Element> ownedElement;

diff --git a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java
@@ -266,30 +266,6 @@ public void setDirection(FeatureDirectionKind direction) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("disjoiningTypeDisjoining")
-    private Collection<Disjoining> disjoiningTypeDisjoining;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "ActionUsage_disjoiningTypeDisjoining",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Disjoining> getDisjoiningTypeDisjoining() {
-        if (disjoiningTypeDisjoining == null) {
-            disjoiningTypeDisjoining = new ArrayList<>();
-        }
-        return disjoiningTypeDisjoining;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
-    public void setDisjoiningTypeDisjoining(Collection<Disjoining> disjoiningTypeDisjoining) {
-        this.disjoiningTypeDisjoining = disjoiningTypeDisjoining;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("disjointType")
     private Collection<Type> disjointType;
@@ -1770,6 +1746,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedDisjoining")
+    private Collection<Disjoining> ownedDisjoining;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "ActionUsage_ownedDisjoining",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Disjoining> getOwnedDisjoining() {
+        if (ownedDisjoining == null) {
+            ownedDisjoining = new ArrayList<>();
+        }
+        return ownedDisjoining;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
+    public void setOwnedDisjoining(Collection<Disjoining> ownedDisjoining) {
+        this.ownedDisjoining = ownedDisjoining;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedElement")
     private List<Element> ownedElement;

diff --git a/app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java
@@ -222,30 +222,6 @@ public void setDirectedUsage(List<Usage> directedUsage) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("disjoiningTypeDisjoining")
-    private Collection<Disjoining> disjoiningTypeDisjoining;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AllocationDefinition_disjoiningTypeDisjoining",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Disjoining> getDisjoiningTypeDisjoining() {
-        if (disjoiningTypeDisjoining == null) {
-            disjoiningTypeDisjoining = new ArrayList<>();
-        }
-        return disjoiningTypeDisjoining;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
-    public void setDisjoiningTypeDisjoining(Collection<Disjoining> disjoiningTypeDisjoining) {
-        this.disjoiningTypeDisjoining = disjoiningTypeDisjoining;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("disjointType")
     private Collection<Type> disjointType;
@@ -1063,6 +1039,32 @@ public void setOwnedConstraint(List<ConstraintUsage> ownedConstraint) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedDisjoining")
+    private Collection<Disjoining> ownedDisjoining;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AllocationDefinition_ownedDisjoining",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Disjoining> getOwnedDisjoining() {
+        if (ownedDisjoining == null) {
+            ownedDisjoining = new ArrayList<>();
+        }
+        return ownedDisjoining;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
+    public void setOwnedDisjoining(Collection<Disjoining> ownedDisjoining) {
+        this.ownedDisjoining = ownedDisjoining;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedElement")
     private List<Element> ownedElement;

diff --git a/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java
@@ -318,30 +318,6 @@ public void setDirection(FeatureDirectionKind direction) {
 
 
 
-    // @info.archinnov.achilles.annotations.Column("disjoiningTypeDisjoining")
-    private Collection<Disjoining> disjoiningTypeDisjoining;
-
-    @JsonGetter
-    @JsonSerialize(contentUsing = MofObjectSerializer.class)
-    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
-    @JoinTable(name = "AllocationUsage_disjoiningTypeDisjoining",
-            joinColumns = @JoinColumn(name = "classId"),
-            inverseJoinColumns = @JoinColumn(name = "attributeId"))
-    public Collection<Disjoining> getDisjoiningTypeDisjoining() {
-        if (disjoiningTypeDisjoining == null) {
-            disjoiningTypeDisjoining = new ArrayList<>();
-        }
-        return disjoiningTypeDisjoining;
-    }
-
-    @JsonSetter
-    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
-    public void setDisjoiningTypeDisjoining(Collection<Disjoining> disjoiningTypeDisjoining) {
-        this.disjoiningTypeDisjoining = disjoiningTypeDisjoining;
-    }
-
-
-
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("disjointType")
     private Collection<Type> disjointType;
@@ -1864,6 +1840,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
 
 
 
+    // @info.archinnov.achilles.annotations.Transient
+    // @info.archinnov.achilles.annotations.Column("ownedDisjoining")
+    private Collection<Disjoining> ownedDisjoining;
+
+    @JsonGetter
+    @JsonSerialize(contentUsing = MofObjectSerializer.class)
+    // @javax.persistence.Transient
+    @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
+    @JoinTable(name = "AllocationUsage_ownedDisjoining",
+            joinColumns = @JoinColumn(name = "classId"),
+            inverseJoinColumns = @JoinColumn(name = "attributeId"))
+    public Collection<Disjoining> getOwnedDisjoining() {
+        if (ownedDisjoining == null) {
+            ownedDisjoining = new ArrayList<>();
+        }
+        return ownedDisjoining;
+    }
+
+    @JsonSetter
+    @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DisjoiningImpl.class)
+    public void setOwnedDisjoining(Collection<Disjoining> ownedDisjoining) {
+        this.ownedDisjoining = ownedDisjoining;
+    }
+
+
+
     // @info.archinnov.achilles.annotations.Transient
     // @info.archinnov.achilles.annotations.Column("ownedElement")
     private List<Element> ownedElement;