Skip to content

Commit

Permalink
[Update] SysML.ecore from source git repos - [TAG: 2024-02] (regenera…
Browse files Browse the repository at this point in the history
…te code)
  • Loading branch information
samatrhea committed Mar 12, 2024
1 parent 7f9ede2 commit 7ef2d45
Show file tree
Hide file tree
Showing 1,908 changed files with 262,798 additions and 260,573 deletions.
4 changes: 2 additions & 2 deletions HtmlDocs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ WORKDIR /usr/share/nginx/html

COPY HtmlDocs/nginx.conf /etc/nginx/nginx.conf

COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net7.0/_SysML2.NET.Core.AutoGenHtmlDocs/index.html .
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net7.0/_SysML2.NET.Core.AutoGenHtmlDocs/sysml2-class-inheritance.svg .
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net8.0/_SysML2.NET.Core.AutoGenHtmlDocs/index.html .
COPY ../SysML2.NET.CodeGenerator.Tests/bin/Debug/net8.0/_SysML2.NET.Core.AutoGenHtmlDocs/sysml2-class-inheritance.svg .
COPY ../SysML2.NET.CodeGenerator/Resources/HtmlDocs .
3 changes: 1 addition & 2 deletions SySML2.NET.REST/SySML2.NET.REST.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>8</LangVersion>
<Version>0.11.0</Version>
<Version>0.12.0</Version>
<Description>A .NET implementation of the OMG SysML v2 REST/HTTP PSM Client</Description>
<PackageId>SysML2.NET.REST</PackageId>
<Company>RHEA System S.A.</Company>
Expand Down
2 changes: 1 addition & 1 deletion SysML2.NET.API/SysML2.NET.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<Version>0.11.0</Version>
<Version>0.12.0</Version>
<Description>A .NET implementation of the REST/HTTP Platform-specific model (PSM) of the SysML v2 API and Services.</Description>
<Company>RHEA System S.A.</Company>
<Copyright>Copyright © RHEA System S.A.</Copyright>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="DataModelLoaderTestFixture.cs" company="RHEA System S.A.">
//
// Copyright 2022-2023 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="AnnotatingElement.cs" company="RHEA System S.A.">
//
// Copyright 2022-2023 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,7 +34,9 @@ namespace SysML2.NET.Core.POCO
/// An AnnotatingElement is an Element that provides additional description of or metadata on some other
/// Element. An AnnotatingElement is either attached to its annotatedElements by Annotation
/// Relationships, or it implicitly annotates its owningNamespace.annotatedElement = if
/// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace} endif
/// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace}
/// endifownedAnnotatingRelationship = ownedRelationship-> selectByKind(Annotation)-> select(a |
/// a.annotatingElement = self)
/// </summary>
public partial class AnnotatingElement : IAnnotatingElement
{
Expand Down Expand Up @@ -135,6 +137,15 @@ public string QueryName()
throw new NotImplementedException("Derived property Name not yet supported");
}

/// <summary>
/// Queries the derived property OwnedAnnotatingRelationship
/// </summary>
[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)]
public List<Annotation> QueryOwnedAnnotatingRelationship()
{
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
}

/// <summary>
/// Queries the derived property OwnedAnnotation
/// </summary>
Expand Down
11 changes: 10 additions & 1 deletion SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Annotation.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="Annotation.cs" company="RHEA System S.A.">
//
// Copyright 2022-2023 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -188,6 +188,15 @@ public IElement QueryOwningAnnotatedElement()
throw new NotImplementedException("Derived property OwningAnnotatedElement not yet supported");
}

/// <summary>
/// Queries the derived property OwningAnnotatingElement
/// </summary>
[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)]
public AnnotatingElement QueryOwningAnnotatingElement()
{
throw new NotImplementedException("Derived property OwningAnnotatingElement not yet supported");
}

/// <summary>
/// Queries the derived property OwningMembership
/// </summary>
Expand Down
11 changes: 10 additions & 1 deletion SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Comment.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="Comment.cs" company="RHEA System S.A.">
//
// Copyright 2022-2023 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -146,6 +146,15 @@ public string QueryName()
throw new NotImplementedException("Derived property Name not yet supported");
}

/// <summary>
/// Queries the derived property OwnedAnnotatingRelationship
/// </summary>
[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)]
public List<Annotation> QueryOwnedAnnotatingRelationship()
{
throw new NotImplementedException("Derived property OwnedAnnotatingRelationship not yet supported");
}

/// <summary>
/// Queries the derived property OwnedAnnotation
/// </summary>
Expand Down
24 changes: 8 additions & 16 deletions SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Connector.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="Connector.cs" company="RHEA System S.A.">
//
// Copyright 2022-2023 RHEA System S.A.
// Copyright 2022-2024 RHEA System S.A.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,17 +36,17 @@ namespace SysML2.NET.Core.POCO
/// of things might be linked. The Connector further restricts these links to be between values of
/// Features on instances of its domain.relatedFeature = connectorEnd.ownedReferenceSubsetting->
/// select(s | s <> null).subsettedFeaturerelatedFeature->forAll(f | if featuringType->isEmpty()
/// then f.isFeaturedWithin(null) else featuringType->exists(t | f.isFeaturedWithin(t))
/// then f.isFeaturedWithin(null) else featuringType->forAll(t | f.isFeaturedWithin(t))
/// endif)sourceFeature = if relatedFeature->isEmpty() then null else relatedFeature->first()
/// endiftargetFeature = if relatedFeature->size() < 2 then OrderedSet{} else
/// relatedFeature-> subSequence(2, relatedFeature->size())-> asOrderedSet()
/// endifnot isAbstract implies relatedFeature->size() >=
/// 2specializesFromLibrary("Links::links")association->exists(oclIsKindOf(AssociationStructure))
/// implies specializesFromLibrary("Objects::linkObjects")connectorEnds->size() = 2
/// 2specializesFromLibrary('Links::links')association->exists(oclIsKindOf(AssociationStructure))
/// implies specializesFromLibrary('Objects::linkObjects')connectorEnds->size() = 2
/// andassociation->exists(oclIsKindOf(AssocationStructure)) implies
/// specializesFromLibrary("Objects::binaryLinkObjects")connectorEnd->size() = 2 implies
/// specializesFromLibrary("Links::binaryLinks")connectorEnds->size() > 2 implies not
/// specializesFromLibrary("Links::BinaryLink")
/// specializesFromLibrary('Objects::binaryLinkObjects')connectorEnd->size() = 2 implies
/// specializesFromLibrary('Links::binaryLinks')connectorEnds->size() > 2 implies not
/// specializesFromLibrary('Links::BinaryLink')
/// </summary>
public partial class Connector : IConnector
{
Expand All @@ -59,7 +59,6 @@ public Connector()
this.IsAbstract = false;
this.IsComposite = false;
this.IsDerived = false;
this.IsDirected = false;
this.IsEnd = false;
this.IsImplied = false;
this.IsImpliedIncluded = false;
Expand Down Expand Up @@ -283,18 +282,11 @@ public bool QueryIsConjugated()
}

/// <summary>
/// Whether the values of this Feature can always be computed from the values of other Feature.
/// Whether the values of this Feature can always be computed from the values of other Features.
/// </summary>
[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)]
public bool IsDerived { get; set; }

/// <summary>
/// For a binary Connector, whether or not the Connector should be considered to have a direction from
/// sourceFeature to targetFeature.
/// </summary>
[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)]
public bool IsDirected { get; set; }

/// <summary>
/// Whether or not the this Feature is an end Feature, requiring a different interpretation of the
/// multiplicity of the Feature.An end Feature is always considered to map each domain instance to a
Expand Down
Loading

0 comments on commit 7ef2d45

Please sign in to comment.