Skip to content

Commit 7ef2d45

Browse files
author
samatrhea
committed
[Update] SysML.ecore from source git repos - [TAG: 2024-02] (regenerate code)
1 parent 7f9ede2 commit 7ef2d45

File tree

1,908 files changed

+262798
-260573
lines changed

Some content is hidden

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

1,908 files changed

+262798
-260573
lines changed

HtmlDocs/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ WORKDIR /usr/share/nginx/html
44

55
COPY HtmlDocs/nginx.conf /etc/nginx/nginx.conf
66

7-
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net7.0/_SysML2.NET.Core.AutoGenHtmlDocs/index.html .
8-
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net7.0/_SysML2.NET.Core.AutoGenHtmlDocs/sysml2-class-inheritance.svg .
7+
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net8.0/_SysML2.NET.Core.AutoGenHtmlDocs/index.html .
8+
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net8.0/_SysML2.NET.Core.AutoGenHtmlDocs/sysml2-class-inheritance.svg .
99
COPY ../SysML2.NET.CodeGenerator/Resources/HtmlDocs .

SySML2.NET.REST/SySML2.NET.REST.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<LangVersion>11.0</LangVersion>
6-
<LangVersion>8</LangVersion>
7-
<Version>0.11.0</Version>
6+
<Version>0.12.0</Version>
87
<Description>A .NET implementation of the OMG SysML v2 REST/HTTP PSM Client</Description>
98
<PackageId>SysML2.NET.REST</PackageId>
109
<Company>RHEA System S.A.</Company>

SysML2.NET.API/SysML2.NET.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<LangVersion>11.0</LangVersion>
6-
<Version>0.11.0</Version>
6+
<Version>0.12.0</Version>
77
<Description>A .NET implementation of the REST/HTTP Platform-specific model (PSM) of the SysML v2 API and Services.</Description>
88
<Company>RHEA System S.A.</Company>
99
<Copyright>Copyright © RHEA System S.A.</Copyright>

SysML2.NET.CodeGenerator.Tests/DataModelLoaderTestFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="DataModelLoaderTestFixture.cs" company="RHEA System S.A.">
33
//
4-
// Copyright 2022-2023 RHEA System S.A.
4+
// Copyright 2022-2024 RHEA System S.A.
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/AnnotatingElement.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="AnnotatingElement.cs" company="RHEA System S.A.">
33
//
4-
// Copyright 2022-2023 RHEA System S.A.
4+
// Copyright 2022-2024 RHEA System S.A.
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -34,7 +34,9 @@ namespace SysML2.NET.Core.POCO
3434
/// An AnnotatingElement is an Element that provides additional description of or metadata on some other
3535
/// Element. An AnnotatingElement is either attached to its annotatedElements by Annotation
3636
/// Relationships, or it implicitly annotates its owningNamespace.annotatedElement = if
37-
/// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace} endif
37+
/// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace}
38+
/// endifownedAnnotatingRelationship = ownedRelationship-> selectByKind(Annotation)-> select(a |
39+
/// a.annotatingElement = self)
3840
/// </summary>
3941
public partial class AnnotatingElement : IAnnotatingElement
4042
{
@@ -135,6 +137,15 @@ public string QueryName()
135137
throw new NotImplementedException("Derived property Name not yet supported");
136138
}
137139

140+
/// <summary>
141+
/// Queries the derived property OwnedAnnotatingRelationship
142+
/// </summary>
143+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
144+
public List<Annotation> QueryOwnedAnnotatingRelationship()
145+
{
146+
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
147+
}
148+
138149
/// <summary>
139150
/// Queries the derived property OwnedAnnotation
140151
/// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Annotation.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="Annotation.cs" company="RHEA System S.A.">
33
//
4-
// Copyright 2022-2023 RHEA System S.A.
4+
// Copyright 2022-2024 RHEA System S.A.
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -188,6 +188,15 @@ public IElement QueryOwningAnnotatedElement()
188188
throw new NotImplementedException("Derived property OwningAnnotatedElement not yet supported");
189189
}
190190

191+
/// <summary>
192+
/// Queries the derived property OwningAnnotatingElement
193+
/// </summary>
194+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
195+
public AnnotatingElement QueryOwningAnnotatingElement()
196+
{
197+
throw new NotImplementedException("Derived property OwningAnnotatingElement not yet supported");
198+
}
199+
191200
/// <summary>
192201
/// Queries the derived property OwningMembership
193202
/// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Comment.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="Comment.cs" company="RHEA System S.A.">
33
//
4-
// Copyright 2022-2023 RHEA System S.A.
4+
// Copyright 2022-2024 RHEA System S.A.
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -146,6 +146,15 @@ public string QueryName()
146146
throw new NotImplementedException("Derived property Name not yet supported");
147147
}
148148

149+
/// <summary>
150+
/// Queries the derived property OwnedAnnotatingRelationship
151+
/// </summary>
152+
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
153+
public List<Annotation> QueryOwnedAnnotatingRelationship()
154+
{
155+
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
156+
}
157+
149158
/// <summary>
150159
/// Queries the derived property OwnedAnnotation
151160
/// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Connector.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="Connector.cs" company="RHEA System S.A.">
33
//
4-
// Copyright 2022-2023 RHEA System S.A.
4+
// Copyright 2022-2024 RHEA System S.A.
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -36,17 +36,17 @@ namespace SysML2.NET.Core.POCO
3636
/// of things might be linked. The Connector further restricts these links to be between values of
3737
/// Features on instances of its domain.relatedFeature = connectorEnd.ownedReferenceSubsetting->
3838
/// select(s | s <> null).subsettedFeaturerelatedFeature->forAll(f | if featuringType->isEmpty()
39-
/// then f.isFeaturedWithin(null) else featuringType->exists(t | f.isFeaturedWithin(t))
39+
/// then f.isFeaturedWithin(null) else featuringType->forAll(t | f.isFeaturedWithin(t))
4040
/// endif)sourceFeature = if relatedFeature->isEmpty() then null else relatedFeature->first()
4141
/// endiftargetFeature = if relatedFeature->size() < 2 then OrderedSet{} else
4242
/// relatedFeature-> subSequence(2, relatedFeature->size())-> asOrderedSet()
4343
/// endifnot isAbstract implies relatedFeature->size() >=
44-
/// 2specializesFromLibrary("Links::links")association->exists(oclIsKindOf(AssociationStructure))
45-
/// implies specializesFromLibrary("Objects::linkObjects")connectorEnds->size() = 2
44+
/// 2specializesFromLibrary('Links::links')association->exists(oclIsKindOf(AssociationStructure))
45+
/// implies specializesFromLibrary('Objects::linkObjects')connectorEnds->size() = 2
4646
/// andassociation->exists(oclIsKindOf(AssocationStructure)) implies
47-
/// specializesFromLibrary("Objects::binaryLinkObjects")connectorEnd->size() = 2 implies
48-
/// specializesFromLibrary("Links::binaryLinks")connectorEnds->size() > 2 implies not
49-
/// specializesFromLibrary("Links::BinaryLink")
47+
/// specializesFromLibrary('Objects::binaryLinkObjects')connectorEnd->size() = 2 implies
48+
/// specializesFromLibrary('Links::binaryLinks')connectorEnds->size() > 2 implies not
49+
/// specializesFromLibrary('Links::BinaryLink')
5050
/// </summary>
5151
public partial class Connector : IConnector
5252
{
@@ -59,7 +59,6 @@ public Connector()
5959
this.IsAbstract = false;
6060
this.IsComposite = false;
6161
this.IsDerived = false;
62-
this.IsDirected = false;
6362
this.IsEnd = false;
6463
this.IsImplied = false;
6564
this.IsImpliedIncluded = false;
@@ -283,18 +282,11 @@ public bool QueryIsConjugated()
283282
}
284283

285284
/// <summary>
286-
/// Whether the values of this Feature can always be computed from the values of other Feature.
285+
/// Whether the values of this Feature can always be computed from the values of other Features.
287286
/// </summary>
288287
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
289288
public bool IsDerived { get; set; }
290289

291-
/// <summary>
292-
/// For a binary Connector, whether or not the Connector should be considered to have a direction from
293-
/// sourceFeature to targetFeature.
294-
/// </summary>
295-
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
296-
public bool IsDirected { get; set; }
297-
298290
/// <summary>
299291
/// Whether or not the this Feature is an end Feature, requiring a different interpretation of the
300292
/// multiplicity of the Feature.An end Feature is always considered to map each domain instance to a

0 commit comments

Comments
 (0)