Skip to content
Snippets Groups Projects
Commit ab8cf39e authored by Janis Daniel Dähne's avatar Janis Daniel Dähne
Browse files

- fixed transformer when there where generics parts

  - in types
  - in method generics definitions
parent e677a8ea
Branches master
No related tags found
No related merge requests found
......@@ -142,6 +142,24 @@ the post processing happens right after the parsing has finished and the model h
- all entities names inside packages are replaced by the full qualified name
- for all entities the parentPackage property is set
## Hints
Full qualified names have no generic part.
```text
class X<T>
//not allowed: class X<T, T2>
class Y
X -- Y //not X<T> !
class M<T> {
foo: List<T>
bar: List<T1, T2> //currently allowed
}
```
## The Parser
......
......@@ -225,7 +225,7 @@ class CommonTransformer {
return CommonTransformer.encloseInAngelBrackets(CommonTransformer.encloseInAngelBrackets(s))
}
static encloseAngelBracketsHtml(s: string | null): string {
static encloseInAngelBracketsHtml(s: string | null): string {
if (s === null) return ''
return `${TransformToGraphviz.angelBracketOpenHtml}${s}${TransformToGraphviz.angelBracketCloseHtml}`
......@@ -233,7 +233,7 @@ class CommonTransformer {
static encloseInDoubleAngelBracketsHtml(s: string | null): string {
if (s === null) return ''
return CommonTransformer.encloseAngelBracketsHtml(CommonTransformer.encloseAngelBracketsHtml(s))
return CommonTransformer.encloseInAngelBracketsHtml(CommonTransformer.encloseInAngelBracketsHtml(s))
}
static transformVisibilityModifier(visibilityModifier: VisibilityModifier | null): string {
......@@ -273,7 +273,7 @@ class CommonTransformer {
genericsPart += `, ${CommonTransformer.transformType(appliedGenericType)}`
}
genericsPart = CommonTransformer.encloseInAngelBrackets(genericsPart)
genericsPart = CommonTransformer.encloseInAngelBracketsHtml(genericsPart)
}
return `${type.name_pk}${genericsPart}${arrayPart}`
......@@ -468,7 +468,7 @@ class ClassTransformer {
let genericsDefinitions = CommonTransformer.transformGenericsDefinitionList(method.genericsDefinitions,
CommonTransformer.encloseAngelBracketsHtml)
CommonTransformer.encloseInAngelBracketsHtml)
methodeCode += `${method.name_pk}${genericsDefinitions}()`
......@@ -507,7 +507,7 @@ class InterfaceTransformer {
let stereotype = CommonTransformer.encloseInDoubleAngelBracketsHtml(stereotypeText)
let genericDefinition = CommonTransformer.transformGenericsDefinitionList(_interface.genericsDefinitions,
CommonTransformer.encloseAngelBracketsHtml)
CommonTransformer.encloseInAngelBracketsHtml)
let displayName = _interface.alias ? _interface.alias : _interface.displayName_pk
......@@ -566,7 +566,7 @@ class InterfaceTransformer {
let methodCode = ''
let genericsDefinitions = CommonTransformer.transformGenericsDefinitionList(method.genericsDefinitions,
CommonTransformer.encloseInAngelBrackets)
CommonTransformer.encloseInAngelBracketsHtml)
methodCode += `${method.name_pk}${genericsDefinitions}()`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment