#172

cimug-org · Oct 16, 2024 · 347b3c4 · 347b3c4
1 parent 4cc9d9a
commit 347b3c4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/CIMToolPlugin/builders/puml-l2r.xsl b/CIMToolPlugin/builders/puml-l2r.xsl
@@ -174,7 +174,7 @@
 			</xsl:variable>
 			<xsl:variable name="targetCardinality">
 				<xsl:choose>
-					<xsl:when test="not(@minCOccurs = '') and not(@maxOccurs = '')"><xsl:call-template name="cardinality"/></xsl:when>
+					<xsl:when test="not(@minCOccurs = '') and not(@maxOccurs = '')"><xsl:call-template name="association-cardinality"/></xsl:when>
 					<xsl:otherwise><xsl:text></xsl:text></xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
@@ -219,21 +219,21 @@
 	<xsl:template match="a:Simple">	
 		<xsl:if test="not(@hideInDiagrams = 'true')">
 			<xsl:variable name="stereotypes"><xsl:call-template name="attribute-stereotypes"/></xsl:variable>
-			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@xstype"/> [<xsl:call-template name="cardinality"/>]</item>
+			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@xstype"/> <xsl:call-template name="cardinality"/></item>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="a:Domain">	
 		<xsl:if test="not(@hideInDiagrams = 'true')">
 			<xsl:variable name="stereotypes"><xsl:call-template name="attribute-stereotypes"/></xsl:variable>
-			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="substring-after(@dataType, '#')"/> [<xsl:call-template name="cardinality"/>]</item>
+			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="substring-after(@dataType, '#')"/> <xsl:call-template name="cardinality"/></item>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="a:Enumerated">
 		<xsl:if test="not(@hideInDiagrams = 'true')">
 			<xsl:variable name="stereotypes"><xsl:call-template name="attribute-stereotypes"/></xsl:variable>
-			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@type"/> [<xsl:call-template name="cardinality"/>]</item>
+			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@type"/> <xsl:call-template name="cardinality"/></item>
 		</xsl:if>
 	</xsl:template>
 
@@ -297,7 +297,18 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template name="cardinality">	
+	<xsl:template name="cardinality">
+		<xsl:choose>
+			<xsl:when test="@minOccurs = 1">
+				<xsl:value-of select="if (@minOccurs = @maxOccurs) then '' else concat(' [', @minOccurs, '..', replace(replace(@maxOccurs, 'unbounded', '*'), 'n', '*'), ']')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="if (@minOccurs = @maxOccurs) then @minOccurs else concat(' [', @minOccurs, '..', replace(replace(@maxOccurs, 'unbounded', '*'), 'n', '*'), ']')"/>
+			</xsl:otherwise>
+		</xsl:choose>	
+	</xsl:template>
+
+	<xsl:template name="association-cardinality">	
 		<xsl:value-of select="if (@minOccurs = @maxOccurs) then @minOccurs else concat(@minOccurs, '..', replace(replace(@maxOccurs, 'unbounded', '*'), 'n', '*'))"/>
 	</xsl:template>
 

diff --git a/CIMToolPlugin/builders/puml-t2b.xsl b/CIMToolPlugin/builders/puml-t2b.xsl
@@ -174,7 +174,7 @@
 			</xsl:variable>
 			<xsl:variable name="targetCardinality">
 				<xsl:choose>
-					<xsl:when test="not(@minCOccurs = '') and not(@maxOccurs = '')"><xsl:call-template name="cardinality"/></xsl:when>
+					<xsl:when test="not(@minCOccurs = '') and not(@maxOccurs = '')"><xsl:call-template name="association-cardinality"/></xsl:when>
 					<xsl:otherwise><xsl:text></xsl:text></xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
@@ -219,21 +219,21 @@
 	<xsl:template match="a:Simple">	
 		<xsl:if test="not(@hideInDiagrams = 'true')">
 			<xsl:variable name="stereotypes"><xsl:call-template name="attribute-stereotypes"/></xsl:variable>
-			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@xstype"/> [<xsl:call-template name="cardinality"/>]</item>
+			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@xstype"/> <xsl:call-template name="cardinality"/></item>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="a:Domain">	
 		<xsl:if test="not(@hideInDiagrams = 'true')">
 			<xsl:variable name="stereotypes"><xsl:call-template name="attribute-stereotypes"/></xsl:variable>
-			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="substring-after(@dataType, '#')"/> [<xsl:call-template name="cardinality"/>]</item>
+			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="substring-after(@dataType, '#')"/> <xsl:call-template name="cardinality"/></item>
 		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="a:Enumerated">
 		<xsl:if test="not(@hideInDiagrams = 'true')">
 			<xsl:variable name="stereotypes"><xsl:call-template name="attribute-stereotypes"/></xsl:variable>
-			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@type"/> [<xsl:call-template name="cardinality"/>]</item>
+			<item>+<xsl:choose><xsl:when test="not($stereotypes = '')"><xsl:value-of select="concat($stereotypes, ' ')"/></xsl:when><xsl:otherwise></xsl:otherwise></xsl:choose><xsl:value-of select="@name"/> : <xsl:value-of select="@type"/> <xsl:call-template name="cardinality"/></item>
 		</xsl:if>
 	</xsl:template>
 
@@ -297,7 +297,18 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template name="cardinality">	
+	<xsl:template name="cardinality">
+		<xsl:choose>
+			<xsl:when test="@minOccurs = 1">
+				<xsl:value-of select="if (@minOccurs = @maxOccurs) then '' else concat(' [', @minOccurs, '..', replace(replace(@maxOccurs, 'unbounded', '*'), 'n', '*'), ']')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="if (@minOccurs = @maxOccurs) then @minOccurs else concat(' [', @minOccurs, '..', replace(replace(@maxOccurs, 'unbounded', '*'), 'n', '*'), ']')"/>
+			</xsl:otherwise>
+		</xsl:choose>	
+	</xsl:template>
+
+	<xsl:template name="association-cardinality">	
 		<xsl:value-of select="if (@minOccurs = @maxOccurs) then @minOccurs else concat(@minOccurs, '..', replace(replace(@maxOccurs, 'unbounded', '*'), 'n', '*'))"/>
 	</xsl:template>