Skip to content

Commit 44041c1

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'release/2022-03'
2 parents 97fe096 + a426861 commit 44041c1

File tree

502 files changed

+10204
-11484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

502 files changed

+10204
-11484
lines changed

‎app/org/omg/sysml/lifecycle/impl/package-info.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
@MetaValue(value = "AnalysisCaseDefinition", targetEntity = AnalysisCaseDefinitionImpl.class),
3737
@MetaValue(value = "AnalysisCaseUsage", targetEntity = AnalysisCaseUsageImpl.class),
3838
@MetaValue(value = "AnnotatingElement", targetEntity = AnnotatingElementImpl.class),
39-
@MetaValue(value = "AnnotatingFeature", targetEntity = AnnotatingFeatureImpl.class),
4039
@MetaValue(value = "Annotation", targetEntity = AnnotationImpl.class),
4140
@MetaValue(value = "AssertConstraintUsage", targetEntity = AssertConstraintUsageImpl.class),
4241
@MetaValue(value = "AssignmentActionUsage", targetEntity = AssignmentActionUsageImpl.class),
@@ -120,8 +119,10 @@
120119
@MetaValue(value = "LoopActionUsage", targetEntity = LoopActionUsageImpl.class),
121120
@MetaValue(value = "Membership", targetEntity = MembershipImpl.class),
122121
@MetaValue(value = "MergeNode", targetEntity = MergeNodeImpl.class),
122+
@MetaValue(value = "Metaclass", targetEntity = MetaclassImpl.class),
123+
@MetaValue(value = "MetadataDefinition", targetEntity = MetadataDefinitionImpl.class),
123124
@MetaValue(value = "MetadataFeature", targetEntity = MetadataFeatureImpl.class),
124-
@MetaValue(value = "MetadataFeatureValue", targetEntity = MetadataFeatureValueImpl.class),
125+
@MetaValue(value = "MetadataUsage", targetEntity = MetadataUsageImpl.class),
125126
@MetaValue(value = "Multiplicity", targetEntity = MultiplicityImpl.class),
126127
@MetaValue(value = "MultiplicityRange", targetEntity = MultiplicityRangeImpl.class),
127128
@MetaValue(value = "Namespace", targetEntity = NamespaceImpl.class),

‎app/org/omg/sysml/metamodel/Comment.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@
2626
import java.util.Set;
2727

2828
public interface Comment extends AnnotatingElement, SysMLType {
29+
String getLocale();
30+
2931
String getBody();
3032
}

‎app/org/omg/sysml/metamodel/Documentation.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface Documentation extends Annotation, SysMLType {
29-
Element getOwningDocumentedElement();
30-
31-
Comment getDocumentingComment();
28+
public interface Documentation extends Comment, SysMLType {
29+
Element getDocumentedElement();
3230
}

‎app/org/omg/sysml/metamodel/Element.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@ public interface Element extends SysMLType {
4444

4545
List<? extends Documentation> getDocumentation();
4646

47-
List<? extends Comment> getDocumentationComment();
48-
4947
List<? extends Annotation> getOwnedAnnotation();
5048

51-
Collection<? extends TextualRepresentation> getOwnedTextualRepresentation();
49+
List<? extends TextualRepresentation> getTextualRepresentation();
5250

5351
String getQualifiedName();
5452

app/org/omg/sysml/metamodel/MetadataFeatureValue.java renamed to app/org/omg/sysml/metamodel/Metaclass.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface MetadataFeatureValue extends FeatureValue, SysMLType {
29-
Expression getMetadataValue();
28+
public interface Metaclass extends Structure, SysMLType {
3029

31-
MetadataFeature getOwningMetadataFeature();
3230
}

app/org/omg/sysml/metamodel/AnnotatingFeature.java renamed to app/org/omg/sysml/metamodel/MetadataDefinition.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface AnnotatingFeature extends AnnotatingElement, Feature, SysMLType {
29-
DataType getMetadataType();
28+
public interface MetadataDefinition extends Definition, ItemDefinition, Metaclass, SysMLType {
3029

31-
List<? extends MetadataFeature> getOwnedMetadata();
3230
}

‎app/org/omg/sysml/metamodel/MetadataFeature.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
import java.util.List;
2626
import java.util.Set;
2727

28-
public interface MetadataFeature extends Feature, SysMLType {
29-
MetadataFeatureValue getMetadataFeatureValue();
28+
public interface MetadataFeature extends AnnotatingElement, Feature, SysMLType {
29+
Metaclass getMetaclass();
3030
}

‎app/org/omg/sysml/metamodel/MetadataUsage.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* SysML v2 REST/HTTP Pilot Implementation
3+
* Copyright (C) 2020 InterCAX LLC
4+
* Copyright (C) 2020 California Institute of Technology ("Caltech")
5+
*
6+
* This program is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Lesser General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Lesser General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Lesser General Public License
17+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
18+
*
19+
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
20+
*/
21+
22+
package org.omg.sysml.metamodel;
23+
24+
import java.util.Collection;
25+
import java.util.List;
26+
import java.util.Set;
27+
28+
public interface MetadataUsage extends ItemUsage, MetadataFeature, Usage, SysMLType {
29+
Metaclass getMetadataDefinition();
30+
}

‎app/org/omg/sysml/metamodel/TextualRepresentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public interface TextualRepresentation extends AnnotatingElement, SysMLType {
2929
String getLanguage();
3030

31-
String getBody();
32-
3331
Element getRepresentedElement();
32+
33+
String getBody();
3434
}

‎app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java‎

Lines changed: 26 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -292,32 +292,6 @@ public void setDocumentation(List<Documentation> documentation) {
292292

293293

294294

295-
// @info.archinnov.achilles.annotations.Transient
296-
// @info.archinnov.achilles.annotations.Column("documentationComment")
297-
private List<Comment> documentationComment;
298-
299-
@JsonGetter
300-
@JsonSerialize(contentUsing = DataSerializer.class)
301-
// @javax.persistence.Transient
302-
@ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
303-
@JoinTable(name = "AcceptActionUsage_documentationComment",
304-
joinColumns = @JoinColumn(name = "classId"),
305-
inverseJoinColumns = @JoinColumn(name = "attributeId"))
306-
public List<Comment> getDocumentationComment() {
307-
if (documentationComment == null) {
308-
documentationComment = new ArrayList<>();
309-
}
310-
return documentationComment;
311-
}
312-
313-
@JsonSetter
314-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = CommentImpl.class)
315-
public void setDocumentationComment(List<Comment> documentationComment) {
316-
this.documentationComment = documentationComment;
317-
}
318-
319-
320-
321295
// @info.archinnov.achilles.annotations.Transient
322296
// @info.archinnov.achilles.annotations.Column("effectiveName")
323297
private String effectiveName;
@@ -2056,32 +2030,6 @@ public void setOwnedSubsetting(Collection<Subsetting> ownedSubsetting) {
20562030

20572031

20582032

2059-
// @info.archinnov.achilles.annotations.Transient
2060-
// @info.archinnov.achilles.annotations.Column("ownedTextualRepresentation")
2061-
private Collection<TextualRepresentation> ownedTextualRepresentation;
2062-
2063-
@JsonGetter
2064-
@JsonSerialize(contentUsing = DataSerializer.class)
2065-
// @javax.persistence.Transient
2066-
@ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
2067-
@JoinTable(name = "AcceptActionUsage_ownedTextualRepresentation",
2068-
joinColumns = @JoinColumn(name = "classId"),
2069-
inverseJoinColumns = @JoinColumn(name = "attributeId"))
2070-
public Collection<TextualRepresentation> getOwnedTextualRepresentation() {
2071-
if (ownedTextualRepresentation == null) {
2072-
ownedTextualRepresentation = new ArrayList<>();
2073-
}
2074-
return ownedTextualRepresentation;
2075-
}
2076-
2077-
@JsonSetter
2078-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class)
2079-
public void setOwnedTextualRepresentation(Collection<TextualRepresentation> ownedTextualRepresentation) {
2080-
this.ownedTextualRepresentation = ownedTextualRepresentation;
2081-
}
2082-
2083-
2084-
20852033
// @info.archinnov.achilles.annotations.Transient
20862034
// @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing")
20872035
private List<TypeFeaturing> ownedTypeFeaturing;
@@ -2444,6 +2392,32 @@ public void setReceiverArgument(Expression receiverArgument) {
24442392

24452393

24462394

2395+
// @info.archinnov.achilles.annotations.Transient
2396+
// @info.archinnov.achilles.annotations.Column("textualRepresentation")
2397+
private List<TextualRepresentation> textualRepresentation;
2398+
2399+
@JsonGetter
2400+
@JsonSerialize(contentUsing = DataSerializer.class)
2401+
// @javax.persistence.Transient
2402+
@ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY)
2403+
@JoinTable(name = "AcceptActionUsage_textualRepresentation",
2404+
joinColumns = @JoinColumn(name = "classId"),
2405+
inverseJoinColumns = @JoinColumn(name = "attributeId"))
2406+
public List<TextualRepresentation> getTextualRepresentation() {
2407+
if (textualRepresentation == null) {
2408+
textualRepresentation = new ArrayList<>();
2409+
}
2410+
return textualRepresentation;
2411+
}
2412+
2413+
@JsonSetter
2414+
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class)
2415+
public void setTextualRepresentation(List<TextualRepresentation> textualRepresentation) {
2416+
this.textualRepresentation = textualRepresentation;
2417+
}
2418+
2419+
2420+
24472421
// @info.archinnov.achilles.annotations.Transient
24482422
// @info.archinnov.achilles.annotations.Column("type")
24492423
private List<Type> type;

0 commit comments

Comments
 (0)