Merge pull request #510 from ZeligsoftDev/streams/v3-issues/477

Issue #477: (v3) Added constraint to validate legality of names
ZeligsoftDev · Jun 12, 2024 · ba9052e · ba9052e
2 parents 0647105 + 53eb01d
commit ba9052e
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 103 deletions.
diff --git a/bundles/com.zeligsoft.domain.dds4ccm/models/DDS4CCM.notation b/bundles/com.zeligsoft.domain.dds4ccm/models/DDS4CCM.notation
@@ -23,7 +23,7 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_1kFc7QPCEe2G86ayG7vqfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1kFc7gPCEe2G86ayG7vqfA"/>
     </children>
-    <element xmi:type="uml:Class" href="DDS4CCM.uml#_Pbd6gAFmEe2ZmOb6CqM5rw"/>
+    <element xmi:type="uml:Class" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_Pbd6gAFmEe2ZmOb6CqM5rw"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1j_9UQPCEe2G86ayG7vqfA" x="100" y="120"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_2Ee0MAPCEe2G86ayG7vqfA" type="Class_Shape">
@@ -49,29 +49,29 @@
       <styles xmi:type="notation:FilteringStyle" xmi:id="_2EhQdwPCEe2G86ayG7vqfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2EhQeAPCEe2G86ayG7vqfA"/>
     </children>
-    <element xmi:type="uml:Class" href="DDS4CCM.uml#_LeqTQAPCEe2G86ayG7vqfA"/>
+    <element xmi:type="uml:Class" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_LeqTQAPCEe2G86ayG7vqfA"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Ee0MQPCEe2G86ayG7vqfA" x="520" y="120"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_qGE8YCMaEe2t6oKBjx6MaA" type="StereotypeComment">
     <styles xmi:type="notation:TitleStyle" xmi:id="_qGE8YSMaEe2t6oKBjx6MaA"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGE8YyMaEe2t6oKBjx6MaA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="DDS4CCM.uml#_Pbd6gAFmEe2ZmOb6CqM5rw"/>
+      <eObjectValue xmi:type="uml:Class" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_Pbd6gAFmEe2ZmOb6CqM5rw"/>
     </styles>
     <element xsi:nil="true"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGE8YiMaEe2t6oKBjx6MaA" x="300" y="120"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_qGLqECMaEe2t6oKBjx6MaA" type="StereotypeComment">
     <styles xmi:type="notation:TitleStyle" xmi:id="_qGLqESMaEe2t6oKBjx6MaA"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGLqEyMaEe2t6oKBjx6MaA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Association" href="DDS4CCM.uml#_C31K4APDEe2G86ayG7vqfA"/>
+      <eObjectValue xmi:type="uml:Association" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_C31K4APDEe2G86ayG7vqfA"/>
     </styles>
     <element xsi:nil="true"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGLqEiMaEe2t6oKBjx6MaA" x="300" y="20"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_qGP7hSMaEe2t6oKBjx6MaA" type="StereotypeComment">
     <styles xmi:type="notation:TitleStyle" xmi:id="_qGP7hiMaEe2t6oKBjx6MaA"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGP7iCMaEe2t6oKBjx6MaA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="DDS4CCM.uml#_LeqTQAPCEe2G86ayG7vqfA"/>
+      <eObjectValue xmi:type="uml:Class" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_LeqTQAPCEe2G86ayG7vqfA"/>
     </styles>
     <element xsi:nil="true"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qGP7hyMaEe2t6oKBjx6MaA" x="720" y="120"/>
@@ -102,15 +102,15 @@
       <layoutConstraint xmi:type="notation:Location" xmi:id="_C4NlaQPDEe2G86ayG7vqfA" y="-20"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_C4M-UQPDEe2G86ayG7vqfA"/>
-    <element xmi:type="uml:Association" href="DDS4CCM.uml#_C31K4APDEe2G86ayG7vqfA"/>
+    <element xmi:type="uml:Association" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_C31K4APDEe2G86ayG7vqfA"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C4M-UgPDEe2G86ayG7vqfA" points="[235, 160, -643984, -643984]$[520, 160, -643984, -643984]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C5PgIAPDEe2G86ayG7vqfA" id="(1.0,0.4)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C5PgIQPDEe2G86ayG7vqfA" id="(0.0,0.4)"/>
   </edges>
   <edges xmi:type="notation:Connector" xmi:id="_qGE8ZCMaEe2t6oKBjx6MaA" type="StereotypeCommentLink" source="_1j_9UAPCEe2G86ayG7vqfA" target="_qGE8YCMaEe2t6oKBjx6MaA">
     <styles xmi:type="notation:FontStyle" xmi:id="_qGE8ZSMaEe2t6oKBjx6MaA"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGE8aSMaEe2t6oKBjx6MaA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="DDS4CCM.uml#_Pbd6gAFmEe2ZmOb6CqM5rw"/>
+      <eObjectValue xmi:type="uml:Class" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_Pbd6gAFmEe2ZmOb6CqM5rw"/>
     </styles>
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qGE8ZiMaEe2t6oKBjx6MaA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -120,7 +120,7 @@
   <edges xmi:type="notation:Connector" xmi:id="_qGLqFCMaEe2t6oKBjx6MaA" type="StereotypeCommentLink" source="_C4M-UAPDEe2G86ayG7vqfA" target="_qGLqECMaEe2t6oKBjx6MaA">
     <styles xmi:type="notation:FontStyle" xmi:id="_qGLqFSMaEe2t6oKBjx6MaA"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGLqGSMaEe2t6oKBjx6MaA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Association" href="DDS4CCM.uml#_C31K4APDEe2G86ayG7vqfA"/>
+      <eObjectValue xmi:type="uml:Association" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_C31K4APDEe2G86ayG7vqfA"/>
     </styles>
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qGLqFiMaEe2t6oKBjx6MaA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
@@ -130,7 +130,7 @@
   <edges xmi:type="notation:Connector" xmi:id="_qGP7iSMaEe2t6oKBjx6MaA" type="StereotypeCommentLink" source="_2Ee0MAPCEe2G86ayG7vqfA" target="_qGP7hSMaEe2t6oKBjx6MaA">
     <styles xmi:type="notation:FontStyle" xmi:id="_qGP7iiMaEe2t6oKBjx6MaA"/>
     <styles xmi:type="notation:EObjectValueStyle" xmi:id="_qGP7jiMaEe2t6oKBjx6MaA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="DDS4CCM.uml#_LeqTQAPCEe2G86ayG7vqfA"/>
+      <eObjectValue xmi:type="uml:Class" href="pathmap://DDS4CCM_DOMAIN/DDS4CCM.uml#_LeqTQAPCEe2G86ayG7vqfA"/>
     </styles>
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qGP7iyMaEe2t6oKBjx6MaA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

diff --git a/bundles/com.zeligsoft.domain.dds4ccm/models/DDS4CCM.properties b/bundles/com.zeligsoft.domain.dds4ccm/models/DDS4CCM.properties
@@ -1,4 +1,4 @@
-#Wed Jul 12 16:34:05 EDT 2023
+#Mon Jun 10 18:14:14 EDT 2024
 _label_DDS4CCM__DDSExtensions__MessageField__isKey=Is Key
 _mesg_DDS4CCM__DDS4CCM__DDS4CCMModel__check_model_migration=Model migration is required. Right click the root of the model and use Refactor -> Migrate Model action.
 _label_DDS4CCM__QoSProfiles__QoSProfile__qosForEntity=Qos For Entity
@@ -76,3 +76,5 @@ _label_DDS4CCM__QoSProfiles__QoSEntity__type=Type
 _label_DDS4CCM__DDS4CCM=DDS4CCM
 _label_DDS4CCM__DDS4CCM__IDLIncludeDependency=IDL Include Dependency
 _label_DDS4CCM__DDS4CCM__DDS4CCMModel__fixedFooter=Fixed Footer
+_desc_DDS4CCM__Constraints__valid_name=Entity names can contain only letters, digits or underscores, and begin with a letter or underscore character.
+_mesg_DDS4CCM__Constraints__valid_name=Invalid element name: "{0}"