diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin index 136c28c..03c263a 100644 Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin index 7f19d80..6528350 100644 Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin index 136c28c..03c263a 100644 Binary files a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin and b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeModule.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin index 7f19d80..6528350 100644 Binary files a/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin and b/org.xtext.unipampa.erdsl.ide/xtend-gen/org/xtext/unipampa/erdsl/ide/.ErDslIdeSetup.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin b/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin index cb2b32f..60ffe93 100644 Binary files a/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin and b/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin b/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin index cb2b32f..60ffe93 100644 Binary files a/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin and b/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin index b564c87..e751614 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin index 02e5136..8d97e5a 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin index 83fda56..cb7841d 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin index 1b51ff6..070a4b6 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin index 75d9667..ffc7bbc 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin index ebd774a..0f0e3b5 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin index 06cf98d..01d8f81 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin index bbd460c..bd0be0a 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin index 1849746..5a82ee6 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin index b564c87..e751614 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin index 02e5136..8d97e5a 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin index 83fda56..cb7841d 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin index 1b51ff6..070a4b6 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin index 75d9667..ffc7bbc 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin index ebd774a..0f0e3b5 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin index 06cf98d..01d8f81 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin index bbd460c..bd0be0a 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin index 1849746..5a82ee6 100644 Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin index 6b71cd1..2c70848 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin index ff8b424..590f163 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin index d24ab65..7eb5ccf 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin index ee54889..2289735 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin index 01f62a1..697cd97 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace index 8968ec1..01cb00e 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin index 119c7e7..a079c0d 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin index 235b105..2d4c08c 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin index e0df51e..e869fed 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.class index d5bfc09..3d36503 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend index 6bf8c36..631744d 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend @@ -65,7 +65,7 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { skinparam titleBorderThickness 1 ' skinparam titleBorderColor red ' skinparam titleBackgroundColor CadetBlue - scale 2.0 + scale 1.5 ' skinparam monochrome true header Diagram generated by ERtext @@ -83,8 +83,6 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { def private CharSequence plotToPlantUML(Relation r) ''' ' top to bottom direction left to right direction - ' diamond «r.name.toLowerCase»_dmd - «IF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» «initDefaultObjects(r)» package relationship { @@ -92,36 +90,52 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x2_y3 } - A -- X - B -- Z + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ - object A - object B + object x1 + object x2 } - + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ - object X - object Y - object Z + object y1 + object y2 + object y3 + } + + package relationship { + object x1_y1 + object x2_y3 } - A -- X - B -- Z + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ - object A - object B - object C + object x1 + object x2 + object x3 } package «r.rightEnding.target.toString»«r.rightEnding.cardinality» { - object X - object Y + object y1 + object y2 + } + + package relationship { + object x1_y1 + object x3_y2 } - A -- X - C -- Y + x1 ---- x1_y1 + x1_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» «initDefaultObjects(r)» package relationship { @@ -130,28 +144,301 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x3_y3 } - x1 -- x1_y1 - x1_y1 -- y1 - x2 -- x2_y2 - x2_y2 -- y2 - x3 -- x3_y3 - x3_y3 -- y3 + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y2 + x2_y2 ---- y2 + x3 ---- x3_y3 + x3_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» - 0,1 - 1,n + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x2_y3 + object x2_y4 + object x3_y5 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x2 ---- x2_y3 + x2_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x3 ---- x3_y5 + x3_y5 ---- y5 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» - 1,1 - 1,n + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x1_y3 + object x2_y4 + object x2_y5 + object x3_y6 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x2 ---- x2_y5 + x2_y5 ---- y5 + x3 ---- x3_y6 + x3_y6 ---- y6 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» - 1,n - 0,1 + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y2 + object x4_y2 + object x5_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y3 + x5_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» - 1,n - 1,1 + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y1 + object x4_y2 + object x5_y2 + object x6_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y1 + x3_y1 - y1 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y2 + x5_y2 ---- y2 + x6 ---- x6_y3 + x6_y3 ---- y3 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y2 + object x4_y2 + object x5_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y3 + x5_y3 ---- y3 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» - 0,1 - 0,n + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x2_y3 + object x2_y4 + object x3_y5 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x2 ---- x2_y3 + x2_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x3 ---- x3_y5 + x3_y5 ---- y5 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» - 1,1 - 0,n - «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» - 0,n - 0,1 - «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» - 0,n - 1,1 + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x2_y3 + object x2_y4 + object x2_y5 + object x3_y6 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x2 ---- x2_y3 + x2_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x2 ---- x2_y5 + x2_y5 ---- y5 + x3 ---- x3_y6 + x3_y6 ---- y6 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y2 + object x4_y2 + object x5_y2 + object x6_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y2 + x5_y2 ---- y2 + x6 ---- x6_y3 + x6_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» «initDefaultObjects(r)» package relationship { @@ -161,14 +448,14 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x2_y3 } - x1 -- x1_y1 - x1_y1 -- y1 - x1 -- x1_y3 - x1_y3 -- y3 - x2 -- x2_y1 - x2_y1 -- y1 - x2 -- x2_y3 - x2_y3 -- y3 + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y1 + x2_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» «initDefaultObjects(r)» package relationship { @@ -180,18 +467,18 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x3_y2 } - x1 -- x1_y1 - x1_y1 -- y1 - x1 -- x1_y2 - x1_y2 -- y2 - x1 -- x1_y3 - x1_y3 -- y3 - x2 -- x2_y1 - x2_y1 -- y1 - x2 -- x2_y3 - x2_y3 -- y3 - x3 -- x3_y2 - x3_y2 -- y2 + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y1 + x2_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 + x3 ---- x3_y2 + x3_y2 ---- y2 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» «initDefaultObjects(r)» package relationship { @@ -202,16 +489,16 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x3_y2 } - x1 -- x1_y1 - x1_y1 -- y1 - x2 -- x2_y1 - x2_y1 -- y1 - x3 -- x3_y1 - x3_y1 -- y1 - x1 -- x1_y2 - x1_y2 --y2 - x3 -- x3_y2 - x3_y2 -- y2 + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y1 + x3_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ----y2 + x3 ---- x3_y2 + x3_y2 ---- y2 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» «initDefaultObjects(r)» package relationship { @@ -222,20 +509,20 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x2_y3 } - x1 -- x1_y1 - x1_y1 -- y1 - x2 -- x2_y2 - x2_y2 -- y2 - x1 -- x1_y3 - x1_y3 -- y3 - x2 -- x2_y1 - x2_y1 -- y1 - x2 -- x2_y3 - x2_y3 -- y3 + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y2 + x2_y2 ---- y2 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y1 + x2_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ENDIF» ''' - def private initDefaultObjects(Relation r) ''' + def private CharSequence initDefaultObjects(Relation r) ''' package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { object x1 object x2 diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin index c9c8095..3c46b70 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin index 3dd0011..449a184 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend index 6bf8c36..631744d 100644 --- a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend +++ b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend @@ -65,7 +65,7 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { skinparam titleBorderThickness 1 ' skinparam titleBorderColor red ' skinparam titleBackgroundColor CadetBlue - scale 2.0 + scale 1.5 ' skinparam monochrome true header Diagram generated by ERtext @@ -83,8 +83,6 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { def private CharSequence plotToPlantUML(Relation r) ''' ' top to bottom direction left to right direction - ' diamond «r.name.toLowerCase»_dmd - «IF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» «initDefaultObjects(r)» package relationship { @@ -92,36 +90,52 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x2_y3 } - A -- X - B -- Z + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ - object A - object B + object x1 + object x2 } - + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ - object X - object Y - object Z + object y1 + object y2 + object y3 + } + + package relationship { + object x1_y1 + object x2_y3 } - A -- X - B -- Z + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ - object A - object B - object C + object x1 + object x2 + object x3 } package «r.rightEnding.target.toString»«r.rightEnding.cardinality» { - object X - object Y + object y1 + object y2 + } + + package relationship { + object x1_y1 + object x3_y2 } - A -- X - C -- Y + x1 ---- x1_y1 + x1_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» «initDefaultObjects(r)» package relationship { @@ -130,28 +144,301 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x3_y3 } - x1 -- x1_y1 - x1_y1 -- y1 - x2 -- x2_y2 - x2_y2 -- y2 - x3 -- x3_y3 - x3_y3 -- y3 + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y2 + x2_y2 ---- y2 + x3 ---- x3_y3 + x3_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» - 0,1 - 1,n + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x2_y3 + object x2_y4 + object x3_y5 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x2 ---- x2_y3 + x2_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x3 ---- x3_y5 + x3_y5 ---- y5 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» - 1,1 - 1,n + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x1_y3 + object x2_y4 + object x2_y5 + object x3_y6 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x2 ---- x2_y5 + x2_y5 ---- y5 + x3 ---- x3_y6 + x3_y6 ---- y6 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» - 1,n - 0,1 + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y2 + object x4_y2 + object x5_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y3 + x5_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» - 1,n - 1,1 + package «r.leftEnding.target.toString»«r.leftEnding.cardinality»{ + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object y1 + object y2 + object y3 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y1 + object x4_y2 + object x5_y2 + object x6_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y1 + x3_y1 - y1 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y2 + x5_y2 ---- y2 + x6 ---- x6_y3 + x6_y3 ---- y3 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y2 + object x4_y2 + object x5_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y3 + x5_y3 ---- y3 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» - 0,1 - 0,n + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x2_y3 + object x2_y4 + object x3_y5 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x2 ---- x2_y3 + x2_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x3 ---- x3_y5 + x3_y5 ---- y5 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» - 1,1 - 0,n - «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» - 0,n - 0,1 - «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» - 0,n - 1,1 + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + object y5 + object y6 + } + + package relationship { + object x1_y1 + object x1_y2 + object x2_y3 + object x2_y4 + object x2_y5 + object x3_y6 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x2 ---- x2_y3 + x2_y3 ---- y3 + x2 ---- x2_y4 + x2_y4 ---- y4 + x2 ---- x2_y5 + x2_y5 ---- y5 + x3 ---- x3_y6 + x3_y6 ---- y6 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + object x4 + object x5 + object x6 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + object y4 + } + + package relationship { + object x1_y1 + object x2_y1 + object x3_y2 + object x4_y2 + object x5_y2 + object x6_y3 + } + + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y2 + x3_y2 ---- y2 + x4 ---- x4_y2 + x4_y2 ---- y2 + x5 ---- x5_y2 + x5_y2 ---- y2 + x6 ---- x6_y3 + x6_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» «initDefaultObjects(r)» package relationship { @@ -161,14 +448,14 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x2_y3 } - x1 -- x1_y1 - x1_y1 -- y1 - x1 -- x1_y3 - x1_y3 -- y3 - x2 -- x2_y1 - x2_y1 -- y1 - x2 -- x2_y3 - x2_y3 -- y3 + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y1 + x2_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» «initDefaultObjects(r)» package relationship { @@ -180,18 +467,18 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x3_y2 } - x1 -- x1_y1 - x1_y1 -- y1 - x1 -- x1_y2 - x1_y2 -- y2 - x1 -- x1_y3 - x1_y3 -- y3 - x2 -- x2_y1 - x2_y1 -- y1 - x2 -- x2_y3 - x2_y3 -- y3 - x3 -- x3_y2 - x3_y2 -- y2 + x1 ---- x1_y1 + x1_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ---- y2 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y1 + x2_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 + x3 ---- x3_y2 + x3_y2 ---- y2 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» «initDefaultObjects(r)» package relationship { @@ -202,16 +489,16 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x3_y2 } - x1 -- x1_y1 - x1_y1 -- y1 - x2 -- x2_y1 - x2_y1 -- y1 - x3 -- x3_y1 - x3_y1 -- y1 - x1 -- x1_y2 - x1_y2 --y2 - x3 -- x3_y2 - x3_y2 -- y2 + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y1 + x2_y1 ---- y1 + x3 ---- x3_y1 + x3_y1 ---- y1 + x1 ---- x1_y2 + x1_y2 ----y2 + x3 ---- x3_y2 + x3_y2 ---- y2 «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» «initDefaultObjects(r)» package relationship { @@ -222,20 +509,20 @@ class OccurrenceDiagramGenerator extends AbstractGenerator { object x2_y3 } - x1 -- x1_y1 - x1_y1 -- y1 - x2 -- x2_y2 - x2_y2 -- y2 - x1 -- x1_y3 - x1_y3 -- y3 - x2 -- x2_y1 - x2_y1 -- y1 - x2 -- x2_y3 - x2_y3 -- y3 + x1 ---- x1_y1 + x1_y1 ---- y1 + x2 ---- x2_y2 + x2_y2 ---- y2 + x1 ---- x1_y3 + x1_y3 ---- y3 + x2 ---- x2_y1 + x2_y1 ---- y1 + x2 ---- x2_y3 + x2_y3 ---- y3 «ENDIF» ''' - def private initDefaultObjects(Relation r) ''' + def private CharSequence initDefaultObjects(Relation r) ''' package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { object x1 object x2 diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin index 6b71cd1..2c70848 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslRuntimeModule.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin index ff8b424..590f163 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/.ErDslStandaloneSetup.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin index d24ab65..7eb5ccf 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin index ee54889..2289735 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.HtmlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin index 01f62a1..697cd97 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.MysqlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace index 8968ec1..01cb00e 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.java._trace differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin index 119c7e7..a079c0d 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin index 235b105..2d4c08c 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin index e0df51e..e869fed 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PostgresqlFileGenerator.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.java b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.java index 6734b1e..9cfef18 100644 --- a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.java +++ b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.java @@ -92,7 +92,7 @@ private CharSequence plotToPlantUML(final ERModel it) { _builder.newLine(); _builder.append("\' skinparam titleBackgroundColor CadetBlue"); _builder.newLine(); - _builder.append("scale 2.0"); + _builder.append("scale 1.5"); _builder.newLine(); _builder.append("\' skinparam monochrome true"); _builder.newLine(); @@ -135,12 +135,6 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.newLine(); _builder.append("left to right direction"); _builder.newLine(); - _builder.append("\' diamond "); - String _lowerCase = r.getName().toLowerCase(); - _builder.append(_lowerCase); - _builder.append("_dmd"); - _builder.newLineIfNotEmpty(); - _builder.newLine(); { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { CharSequence _initDefaultObjects = this.initDefaultObjects(r); @@ -157,9 +151,13 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("A -- X"); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("B -- Z"); + _builder.append("x2 ---- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 ---- y3"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { @@ -171,14 +169,13 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("{"); _builder.newLineIfNotEmpty(); _builder.append("\t"); - _builder.append("object A"); + _builder.append("object x1"); _builder.newLine(); _builder.append("\t"); - _builder.append("object B"); + _builder.append("object x2"); _builder.newLine(); _builder.append("}\t"); _builder.newLine(); - _builder.append("\t\t"); _builder.newLine(); _builder.append("package "); String _string_1 = r.getRightEnding().getTarget().toString(); @@ -188,20 +185,35 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("{"); _builder.newLineIfNotEmpty(); _builder.append("\t"); - _builder.append("object X"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); _builder.newLine(); _builder.append("\t"); - _builder.append("object Y"); + _builder.append("object x1_y1"); _builder.newLine(); _builder.append("\t"); - _builder.append("object Z"); + _builder.append("object x2_y3"); _builder.newLine(); _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("A -- X"); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x2 ---- x2_y3"); _builder.newLine(); - _builder.append("B -- Z"); + _builder.append("x2_y3 ---- y3"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { @@ -213,13 +225,13 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("{"); _builder.newLineIfNotEmpty(); _builder.append("\t"); - _builder.append("object A"); + _builder.append("object x1"); _builder.newLine(); _builder.append("\t"); - _builder.append("object B"); + _builder.append("object x2"); _builder.newLine(); _builder.append("\t"); - _builder.append("object C"); + _builder.append("object x3"); _builder.newLine(); _builder.append("}\t"); _builder.newLine(); @@ -233,17 +245,32 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append(" {"); _builder.newLineIfNotEmpty(); _builder.append("\t"); - _builder.append("object X"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); _builder.newLine(); _builder.append("\t"); - _builder.append("object Y"); + _builder.append("object x3_y2"); _builder.newLine(); _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("A -- X"); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("C -- Y"); + _builder.append("x3 ---- x3_y2"); + _builder.newLine(); + _builder.append("x3_y2 ---- y2"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { @@ -264,49 +291,776 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("x1 -- x1_y1"); + _builder.append("x1 ---- x1_y1"); _builder.newLine(); - _builder.append("x1_y1 -- y1"); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("x2 -- x2_y2"); + _builder.append("x2 ---- x2_y2"); _builder.newLine(); - _builder.append("x2_y2 -- y2"); + _builder.append("x2_y2 ---- y2"); _builder.newLine(); - _builder.append("x3 -- x3_y3 "); + _builder.append("x3 ---- x3_y3 "); _builder.newLine(); - _builder.append("x3_y3 -- y3"); + _builder.append("x3_y3 ---- y3"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { - _builder.append("0,1 - 1,n"); + _builder.append("package "); + String _string_4 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_4); + String _cardinality_4 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_4); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _string_5 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_5); + String _cardinality_5 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_5); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y6"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y5"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x1 ---- x1_y2"); + _builder.newLine(); + _builder.append("x1_y2 ---- y2"); + _builder.newLine(); + _builder.append("x2 ---- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 ---- y3"); + _builder.newLine(); + _builder.append("x2 ---- x2_y4"); + _builder.newLine(); + _builder.append("x2_y4 ---- y4"); + _builder.newLine(); + _builder.append("x3 ---- x3_y5"); + _builder.newLine(); + _builder.append("x3_y5 ---- y5"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { - _builder.append("1,1 - 1,n"); + _builder.append("package "); + String _string_6 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_6); + String _cardinality_6 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_6); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package "); + String _string_7 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_7); + String _cardinality_7 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_7); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y6"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y6"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x1 ---- x1_y2"); + _builder.newLine(); + _builder.append("x1_y2 ---- y2"); + _builder.newLine(); + _builder.append("x1 ---- x1_y3"); + _builder.newLine(); + _builder.append("x1_y3 ---- y3"); + _builder.newLine(); + _builder.append("x2 ---- x2_y4"); + _builder.newLine(); + _builder.append("x2_y4 ---- y4"); + _builder.newLine(); + _builder.append("x2 ---- x2_y5"); + _builder.newLine(); + _builder.append("x2_y5 ---- y5"); + _builder.newLine(); + _builder.append("x3 ---- x3_y6"); + _builder.newLine(); + _builder.append("x3_y6 ---- y6"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { - _builder.append("1,n - 0,1"); + _builder.append("package "); + String _string_8 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_8); + String _cardinality_8 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_8); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x6"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _string_9 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_9); + String _cardinality_9 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_9); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5_y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x2 ---- x2_y1"); + _builder.newLine(); + _builder.append("x2_y1 ---- y1"); + _builder.newLine(); + _builder.append("x3 ---- x3_y2"); + _builder.newLine(); + _builder.append("x3_y2 ---- y2"); + _builder.newLine(); + _builder.append("x4 ---- x4_y2 "); + _builder.newLine(); + _builder.append("x4_y2 ---- y2"); + _builder.newLine(); + _builder.append("x5 ---- x5_y3"); + _builder.newLine(); + _builder.append("x5_y3 ---- y3"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { - _builder.append("1,n - 1,1"); + _builder.append("package "); + String _string_10 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_10); + String _cardinality_10 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_10); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x6"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package "); + String _string_11 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_11); + String _cardinality_11 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_11); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x6_y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x2 ---- x2_y1"); + _builder.newLine(); + _builder.append("x2_y1 ---- y1"); + _builder.newLine(); + _builder.append("x3 ---- x3_y1"); + _builder.newLine(); + _builder.append("x3_y1 - y1"); + _builder.newLine(); + _builder.append("x4 ---- x4_y2"); + _builder.newLine(); + _builder.append("x4_y2 ---- y2"); + _builder.newLine(); + _builder.append("x5 ---- x5_y2"); + _builder.newLine(); + _builder.append("x5_y2 ---- y2"); + _builder.newLine(); + _builder.append("x6 ---- x6_y3"); + _builder.newLine(); + _builder.append("x6_y3 ---- y3"); _builder.newLine(); } else { - if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { - _builder.append("0,1 - 0,n"); + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { + _builder.append("package "); + String _string_12 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_12); + String _cardinality_12 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_12); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x6"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _cardinality_13 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_13); + String _string_13 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_13); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y4"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5_y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x2 ---- x2_y1"); + _builder.newLine(); + _builder.append("x2_y1 ---- y1"); + _builder.newLine(); + _builder.append("x3 ---- x3_y2"); + _builder.newLine(); + _builder.append("x3_y2 ---- y2"); + _builder.newLine(); + _builder.append("x4 ---- x4_y2"); + _builder.newLine(); + _builder.append("x4_y2 ---- y2"); + _builder.newLine(); + _builder.append("x5 ---- x5_y3"); + _builder.newLine(); + _builder.append("x5_y3 ---- y3"); + _builder.newLine(); _builder.newLine(); } else { - if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { - _builder.append("1,1 - 0,n"); + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { + _builder.append("package "); + String _string_14 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_14); + String _cardinality_14 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_14); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4 "); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _cardinality_15 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_15); + String _string_15 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_15); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y6"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y5"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x1 ---- x1_y2"); + _builder.newLine(); + _builder.append("x1_y2 ---- y2"); + _builder.newLine(); + _builder.append("x2 ---- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 ---- y3"); + _builder.newLine(); + _builder.append("x2 ---- x2_y4"); + _builder.newLine(); + _builder.append("x2_y4 ---- y4"); + _builder.newLine(); + _builder.append("x3 ---- x3_y5"); + _builder.newLine(); + _builder.append("x3_y5 ---- y5"); _builder.newLine(); } else { - if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { - _builder.append("0,n - 0,1"); + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { + _builder.append("package "); + String _string_16 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_16); + String _cardinality_16 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_16); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4 "); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _cardinality_17 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_17); + String _string_17 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_17); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y6"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y6"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x1 ---- x1_y2"); + _builder.newLine(); + _builder.append("x1_y2 ---- y2"); + _builder.newLine(); + _builder.append("x2 ---- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 ---- y3"); + _builder.newLine(); + _builder.append("x2 ---- x2_y4"); + _builder.newLine(); + _builder.append("x2_y4 ---- y4"); + _builder.newLine(); + _builder.append("x2 ---- x2_y5"); + _builder.newLine(); + _builder.append("x2_y5 ---- y5"); + _builder.newLine(); + _builder.append("x3 ---- x3_y6"); + _builder.newLine(); + _builder.append("x3_y6 ---- y6"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { - _builder.append("0,n - 1,1"); + _builder.append("package "); + String _string_18 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_18); + String _cardinality_18 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_18); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object x1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x6"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _cardinality_19 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_19); + String _string_19 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_19); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object y4"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x4_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x5_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x6_y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("x1 ---- x1_y1"); + _builder.newLine(); + _builder.append("x1_y1 ---- y1"); + _builder.newLine(); + _builder.append("x2 ---- x2_y1"); + _builder.newLine(); + _builder.append("x2_y1 ---- y1"); + _builder.newLine(); + _builder.append("x3 ---- x3_y2"); + _builder.newLine(); + _builder.append("x3_y2 ---- y2"); + _builder.newLine(); + _builder.append("x4 ---- x4_y2"); + _builder.newLine(); + _builder.append("x4_y2 ---- y2"); + _builder.newLine(); + _builder.append("x5 ---- x5_y2"); + _builder.newLine(); + _builder.append("x5_y2 ---- y2"); + _builder.newLine(); + _builder.append("x6 ---- x6_y3"); + _builder.newLine(); + _builder.append("x6_y3 ---- y3"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { @@ -330,21 +1084,21 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("x1 -- x1_y1"); + _builder.append("x1 ---- x1_y1"); _builder.newLine(); - _builder.append("x1_y1 -- y1"); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("x1 -- x1_y3"); + _builder.append("x1 ---- x1_y3"); _builder.newLine(); - _builder.append("x1_y3 -- y3"); + _builder.append("x1_y3 ---- y3"); _builder.newLine(); - _builder.append("x2 -- x2_y1"); + _builder.append("x2 ---- x2_y1"); _builder.newLine(); - _builder.append("x2_y1 -- y1"); + _builder.append("x2_y1 ---- y1"); _builder.newLine(); - _builder.append("x2 -- x2_y3"); + _builder.append("x2 ---- x2_y3"); _builder.newLine(); - _builder.append("x2_y3 -- y3"); + _builder.append("x2_y3 ---- y3"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { @@ -374,29 +1128,29 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("x1 -- x1_y1"); + _builder.append("x1 ---- x1_y1"); _builder.newLine(); - _builder.append("x1_y1 -- y1"); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("x1 -- x1_y2"); + _builder.append("x1 ---- x1_y2"); _builder.newLine(); - _builder.append("x1_y2 -- y2"); + _builder.append("x1_y2 ---- y2"); _builder.newLine(); - _builder.append("x1 -- x1_y3"); + _builder.append("x1 ---- x1_y3"); _builder.newLine(); - _builder.append("x1_y3 -- y3"); + _builder.append("x1_y3 ---- y3"); _builder.newLine(); - _builder.append("x2 -- x2_y1"); + _builder.append("x2 ---- x2_y1"); _builder.newLine(); - _builder.append("x2_y1 -- y1"); + _builder.append("x2_y1 ---- y1"); _builder.newLine(); - _builder.append("x2 -- x2_y3"); + _builder.append("x2 ---- x2_y3"); _builder.newLine(); - _builder.append("x2_y3 -- y3"); + _builder.append("x2_y3 ---- y3"); _builder.newLine(); - _builder.append("x3 -- x3_y2"); + _builder.append("x3 ---- x3_y2"); _builder.newLine(); - _builder.append("x3_y2 -- y2"); + _builder.append("x3_y2 ---- y2"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { @@ -423,25 +1177,25 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("x1 -- x1_y1"); + _builder.append("x1 ---- x1_y1"); _builder.newLine(); - _builder.append("x1_y1 -- y1"); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("x2 -- x2_y1"); + _builder.append("x2 ---- x2_y1"); _builder.newLine(); - _builder.append("x2_y1 -- y1"); + _builder.append("x2_y1 ---- y1"); _builder.newLine(); - _builder.append("x3 -- x3_y1"); + _builder.append("x3 ---- x3_y1"); _builder.newLine(); - _builder.append("x3_y1 -- y1"); + _builder.append("x3_y1 ---- y1"); _builder.newLine(); - _builder.append("x1 -- x1_y2"); + _builder.append("x1 ---- x1_y2"); _builder.newLine(); - _builder.append("x1_y2 --y2"); + _builder.append("x1_y2 ----y2"); _builder.newLine(); - _builder.append("x3 -- x3_y2"); + _builder.append("x3 ---- x3_y2"); _builder.newLine(); - _builder.append("x3_y2 -- y2"); + _builder.append("x3_y2 ---- y2"); _builder.newLine(); } else { if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { @@ -468,25 +1222,25 @@ private CharSequence plotToPlantUML(final Relation r) { _builder.append("}"); _builder.newLine(); _builder.newLine(); - _builder.append("x1 -- x1_y1"); + _builder.append("x1 ---- x1_y1"); _builder.newLine(); - _builder.append("x1_y1 -- y1"); + _builder.append("x1_y1 ---- y1"); _builder.newLine(); - _builder.append("x2 -- x2_y2"); + _builder.append("x2 ---- x2_y2"); _builder.newLine(); - _builder.append("x2_y2 -- y2"); + _builder.append("x2_y2 ---- y2"); _builder.newLine(); - _builder.append("x1 -- x1_y3"); + _builder.append("x1 ---- x1_y3"); _builder.newLine(); - _builder.append("x1_y3 -- y3"); + _builder.append("x1_y3 ---- y3"); _builder.newLine(); - _builder.append("x2 -- x2_y1"); + _builder.append("x2 ---- x2_y1"); _builder.newLine(); - _builder.append("x2_y1 -- y1"); + _builder.append("x2_y1 ---- y1"); _builder.newLine(); - _builder.append("x2 -- x2_y3"); + _builder.append("x2 ---- x2_y3"); _builder.newLine(); - _builder.append("x2_y3 -- y3"); + _builder.append("x2_y3 ---- y3"); _builder.newLine(); } } diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin index c9c8095..3c46b70 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/scoping/.ErDslScopeProvider.xtendbin differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin index 3dd0011..449a184 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/validation/.ErDslValidator.xtendbin differ