diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser$NameMappings.class b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser$NameMappings.class index 9fb46a6..fc6b6c3 100644 Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser$NameMappings.class and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser$NameMappings.class differ diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.class b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.class index e4a3951..10d10a4 100644 Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.class and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.class differ diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g index 9e82861..792da78 100644 --- a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g +++ b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g @@ -64,7 +64,7 @@ import org.xtext.unipampa.erdsl.services.ErDslGrammarAccess; tokenNameToValue.put("PartialDisjoint", "'partial/disjoint'"); tokenNameToValue.put("TotalOverlapped", "'total/overlapped'"); tokenNameToValue.put("PartialOverlapped", "'partial/overlapped'"); - tokenNameToValue.put("GenerateOcurrenceDiagram", "'@generateOcurrenceDiagram'"); + tokenNameToValue.put("GenerateOccurrenceDiagram", "'@generateOccurrenceDiagram'"); } public void setGrammarAccess(ErDslGrammarAccess grammarAccess) { @@ -1611,9 +1611,9 @@ rule__Relation__Group__3__Impl } : ( - { before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); } - (rule__Relation__OcurrenceAssignment_3)? - { after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); } + { before(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); } + (rule__Relation__OccurrenceAssignment_3)? + { after(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); } ) ; finally { @@ -2304,19 +2304,19 @@ finally { restoreStackSize(stackSize); } -rule__Relation__OcurrenceAssignment_3 +rule__Relation__OccurrenceAssignment_3 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } + { before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } ( - { before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } - GenerateOcurrenceDiagram - { after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } + { before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } + GenerateOccurrenceDiagram + { after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } ) - { after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } + { after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } ) ; finally { diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens index 2e5643b..8442fb3 100644 --- a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens +++ b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens @@ -4,7 +4,7 @@ '(1:N)'=25 ','=32 ';'=33 -'@generateOcurrenceDiagram'=4 +'@generateOccurrenceDiagram'=4 'All'=29 'Diagram'=16 'Domain'=19 diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer$DFA12.class b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer$DFA12.class index 342f3d1..db581e3 100644 Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer$DFA12.class and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer$DFA12.class differ diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.class b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.class index 082023a..0cfb205 100644 Binary files a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.class and b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.class differ diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g index 5433a64..ab73b4b 100644 --- a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g +++ b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g @@ -11,7 +11,7 @@ package org.xtext.unipampa.erdsl.ide.contentassist.antlr.lexer; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; } -GenerateOcurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); +GenerateOccurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); PartialOverlapped : ('P'|'p')('A'|'a')('R'|'r')('T'|'t')('I'|'i')('A'|'a')('L'|'l')'/'('O'|'o')('V'|'v')('E'|'e')('R'|'r')('L'|'l')('A'|'a')('P'|'p')('P'|'p')('E'|'e')('D'|'d'); diff --git a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens index da340ad..7ae75a9 100644 --- a/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens +++ b/org.xtext.unipampa.erdsl.ide/bin/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens @@ -8,7 +8,7 @@ Double=20 Entities=13 File=28 Generate=14 -GenerateOcurrenceDiagram=4 +GenerateOccurrenceDiagram=4 Int=30 Is=31 IsIdentifier=11 diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser.java b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser.java index eb01f8c..04df99d 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser.java +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/ErDslParser.java @@ -74,7 +74,7 @@ private static void init(ImmutableMap.Builder builder, builder.put(grammarAccess.getRelationAccess().getRightEndingAssignment_1_3(), "rule__Relation__RightEndingAssignment_1_3"); builder.put(grammarAccess.getRelationAccess().getAttributesAssignment_2_1(), "rule__Relation__AttributesAssignment_2_1"); builder.put(grammarAccess.getRelationAccess().getAttributesAssignment_2_2_1(), "rule__Relation__AttributesAssignment_2_2_1"); - builder.put(grammarAccess.getRelationAccess().getOcurrenceAssignment_3(), "rule__Relation__OcurrenceAssignment_3"); + builder.put(grammarAccess.getRelationAccess().getOccurrenceAssignment_3(), "rule__Relation__OccurrenceAssignment_3"); builder.put(grammarAccess.getRelationSideRightAccess().getCardinalityAssignment_0_0(), "rule__RelationSideRight__CardinalityAssignment_0_0"); builder.put(grammarAccess.getRelationSideRightAccess().getTargetAssignment_0_1(), "rule__RelationSideRight__TargetAssignment_0_1"); builder.put(grammarAccess.getRelationSideRightAccess().getTargetAssignment_1(), "rule__RelationSideRight__TargetAssignment_1"); diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g index 9e82861..792da78 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.g @@ -64,7 +64,7 @@ import org.xtext.unipampa.erdsl.services.ErDslGrammarAccess; tokenNameToValue.put("PartialDisjoint", "'partial/disjoint'"); tokenNameToValue.put("TotalOverlapped", "'total/overlapped'"); tokenNameToValue.put("PartialOverlapped", "'partial/overlapped'"); - tokenNameToValue.put("GenerateOcurrenceDiagram", "'@generateOcurrenceDiagram'"); + tokenNameToValue.put("GenerateOccurrenceDiagram", "'@generateOccurrenceDiagram'"); } public void setGrammarAccess(ErDslGrammarAccess grammarAccess) { @@ -1611,9 +1611,9 @@ rule__Relation__Group__3__Impl } : ( - { before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); } - (rule__Relation__OcurrenceAssignment_3)? - { after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); } + { before(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); } + (rule__Relation__OccurrenceAssignment_3)? + { after(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); } ) ; finally { @@ -2304,19 +2304,19 @@ finally { restoreStackSize(stackSize); } -rule__Relation__OcurrenceAssignment_3 +rule__Relation__OccurrenceAssignment_3 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } + { before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } ( - { before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } - GenerateOcurrenceDiagram - { after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } + { before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } + GenerateOccurrenceDiagram + { after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } ) - { after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); } + { after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } ) ; finally { diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.java b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.java index 6081f84..5c0708b 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.java +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.java @@ -24,13 +24,14 @@ @SuppressWarnings("all") public class InternalErDslParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "GenerateOcurrenceDiagram", "PartialOverlapped", "PartialDisjoint", "TotalOverlapped", "TotalDisjoint", "LogicalSchema", "Relationships", "IsIdentifier", "PostgreSQL", "Entities", "Generate", "Datetime", "Diagram", "Boolean", "Relates", "Domain", "Double", "String", "LeftParenthesisDigitZeroColonDigitOneRightParenthesis", "N", "LeftParenthesisDigitOneColonDigitOneRightParenthesis", "N_1", "MySQL", "Money", "File", "All", "Int", "Is", "Comma", "Semicolon", "LeftSquareBracket", "RightSquareBracket", "LeftCurlyBracket", "RightCurlyBracket", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER" + "", "", "", "", "GenerateOccurrenceDiagram", "PartialOverlapped", "PartialDisjoint", "TotalOverlapped", "TotalDisjoint", "LogicalSchema", "Relationships", "IsIdentifier", "PostgreSQL", "Entities", "Generate", "Datetime", "Diagram", "Boolean", "Relates", "Domain", "Double", "String", "LeftParenthesisDigitZeroColonDigitOneRightParenthesis", "N", "LeftParenthesisDigitOneColonDigitOneRightParenthesis", "N_1", "MySQL", "Money", "File", "All", "Int", "Is", "Comma", "Semicolon", "LeftSquareBracket", "RightSquareBracket", "LeftCurlyBracket", "RightCurlyBracket", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER" }; public static final int All=29; public static final int N_1=25; public static final int PostgreSQL=12; public static final int String=21; public static final int TotalOverlapped=7; + public static final int GenerateOccurrenceDiagram=4; public static final int MySQL=26; public static final int Boolean=17; public static final int RightSquareBracket=35; @@ -49,7 +50,6 @@ public class InternalErDslParser extends AbstractInternalContentAssistParser { public static final int Is=31; public static final int RULE_STRING=40; public static final int LeftParenthesisDigitZeroColonDigitOneRightParenthesis=22; - public static final int GenerateOcurrenceDiagram=4; public static final int N=23; public static final int Int=30; public static final int RULE_SL_COMMENT=42; @@ -123,7 +123,7 @@ public InternalErDslParser(TokenStream input, RecognizerSharedState state) { tokenNameToValue.put("PartialDisjoint", "'partial/disjoint'"); tokenNameToValue.put("TotalOverlapped", "'total/overlapped'"); tokenNameToValue.put("PartialOverlapped", "'partial/overlapped'"); - tokenNameToValue.put("GenerateOcurrenceDiagram", "'@generateOcurrenceDiagram'"); + tokenNameToValue.put("GenerateOccurrenceDiagram", "'@generateOccurrenceDiagram'"); } public void setGrammarAccess(ErDslGrammarAccess grammarAccess) { @@ -4975,32 +4975,32 @@ public final void rule__Relation__Group__3() throws RecognitionException { // $ANTLR start "rule__Relation__Group__3__Impl" - // InternalErDslParser.g:1608:1: rule__Relation__Group__3__Impl : ( ( rule__Relation__OcurrenceAssignment_3 )? ) ; + // InternalErDslParser.g:1608:1: rule__Relation__Group__3__Impl : ( ( rule__Relation__OccurrenceAssignment_3 )? ) ; public final void rule__Relation__Group__3__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalErDslParser.g:1612:1: ( ( ( rule__Relation__OcurrenceAssignment_3 )? ) ) - // InternalErDslParser.g:1613:1: ( ( rule__Relation__OcurrenceAssignment_3 )? ) + // InternalErDslParser.g:1612:1: ( ( ( rule__Relation__OccurrenceAssignment_3 )? ) ) + // InternalErDslParser.g:1613:1: ( ( rule__Relation__OccurrenceAssignment_3 )? ) { - // InternalErDslParser.g:1613:1: ( ( rule__Relation__OcurrenceAssignment_3 )? ) - // InternalErDslParser.g:1614:2: ( rule__Relation__OcurrenceAssignment_3 )? + // InternalErDslParser.g:1613:1: ( ( rule__Relation__OccurrenceAssignment_3 )? ) + // InternalErDslParser.g:1614:2: ( rule__Relation__OccurrenceAssignment_3 )? { - before(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); - // InternalErDslParser.g:1615:2: ( rule__Relation__OcurrenceAssignment_3 )? + before(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); + // InternalErDslParser.g:1615:2: ( rule__Relation__OccurrenceAssignment_3 )? int alt16=2; int LA16_0 = input.LA(1); - if ( (LA16_0==GenerateOcurrenceDiagram) ) { + if ( (LA16_0==GenerateOccurrenceDiagram) ) { alt16=1; } switch (alt16) { case 1 : - // InternalErDslParser.g:1615:3: rule__Relation__OcurrenceAssignment_3 + // InternalErDslParser.g:1615:3: rule__Relation__OccurrenceAssignment_3 { pushFollow(FOLLOW_2); - rule__Relation__OcurrenceAssignment_3(); + rule__Relation__OccurrenceAssignment_3(); state._fsp--; @@ -5010,7 +5010,7 @@ public final void rule__Relation__Group__3__Impl() throws RecognitionException { } - after(grammarAccess.getRelationAccess().getOcurrenceAssignment_3()); + after(grammarAccess.getRelationAccess().getOccurrenceAssignment_3()); } @@ -6982,30 +6982,30 @@ public final void rule__Relation__AttributesAssignment_2_2_1() throws Recognitio // $ANTLR end "rule__Relation__AttributesAssignment_2_2_1" - // $ANTLR start "rule__Relation__OcurrenceAssignment_3" - // InternalErDslParser.g:2307:1: rule__Relation__OcurrenceAssignment_3 : ( ( GenerateOcurrenceDiagram ) ) ; - public final void rule__Relation__OcurrenceAssignment_3() throws RecognitionException { + // $ANTLR start "rule__Relation__OccurrenceAssignment_3" + // InternalErDslParser.g:2307:1: rule__Relation__OccurrenceAssignment_3 : ( ( GenerateOccurrenceDiagram ) ) ; + public final void rule__Relation__OccurrenceAssignment_3() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalErDslParser.g:2311:1: ( ( ( GenerateOcurrenceDiagram ) ) ) - // InternalErDslParser.g:2312:2: ( ( GenerateOcurrenceDiagram ) ) + // InternalErDslParser.g:2311:1: ( ( ( GenerateOccurrenceDiagram ) ) ) + // InternalErDslParser.g:2312:2: ( ( GenerateOccurrenceDiagram ) ) { - // InternalErDslParser.g:2312:2: ( ( GenerateOcurrenceDiagram ) ) - // InternalErDslParser.g:2313:3: ( GenerateOcurrenceDiagram ) + // InternalErDslParser.g:2312:2: ( ( GenerateOccurrenceDiagram ) ) + // InternalErDslParser.g:2313:3: ( GenerateOccurrenceDiagram ) { - before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); - // InternalErDslParser.g:2314:3: ( GenerateOcurrenceDiagram ) - // InternalErDslParser.g:2315:4: GenerateOcurrenceDiagram + before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); + // InternalErDslParser.g:2314:3: ( GenerateOccurrenceDiagram ) + // InternalErDslParser.g:2315:4: GenerateOccurrenceDiagram { - before(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); - match(input,GenerateOcurrenceDiagram,FOLLOW_2); - after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); + before(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); + match(input,GenerateOccurrenceDiagram,FOLLOW_2); + after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } - after(grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); + after(grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } @@ -7024,7 +7024,7 @@ public final void rule__Relation__OcurrenceAssignment_3() throws RecognitionExce } return ; } - // $ANTLR end "rule__Relation__OcurrenceAssignment_3" + // $ANTLR end "rule__Relation__OccurrenceAssignment_3" // $ANTLR start "rule__RelationSideRight__CardinalityAssignment_0_0" diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens index 2e5643b..8442fb3 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/internal/InternalErDslParser.tokens @@ -4,7 +4,7 @@ '(1:N)'=25 ','=32 ';'=33 -'@generateOcurrenceDiagram'=4 +'@generateOccurrenceDiagram'=4 'All'=29 'Diagram'=16 'Domain'=19 diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g index 5433a64..ab73b4b 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.g @@ -11,7 +11,7 @@ package org.xtext.unipampa.erdsl.ide.contentassist.antlr.lexer; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; } -GenerateOcurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); +GenerateOccurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); PartialOverlapped : ('P'|'p')('A'|'a')('R'|'r')('T'|'t')('I'|'i')('A'|'a')('L'|'l')'/'('O'|'o')('V'|'v')('E'|'e')('R'|'r')('L'|'l')('A'|'a')('P'|'p')('P'|'p')('E'|'e')('D'|'d'); diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.java b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.java index eb72828..94d3399 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.java +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.java @@ -17,6 +17,7 @@ public class InternalErDslLexer extends Lexer { public static final int PostgreSQL=12; public static final int String=21; public static final int TotalOverlapped=7; + public static final int GenerateOccurrenceDiagram=4; public static final int MySQL=26; public static final int Boolean=17; public static final int RightSquareBracket=35; @@ -35,7 +36,6 @@ public class InternalErDslLexer extends Lexer { public static final int Is=31; public static final int RULE_STRING=40; public static final int LeftParenthesisDigitZeroColonDigitOneRightParenthesis=22; - public static final int GenerateOcurrenceDiagram=4; public static final int N=23; public static final int Int=30; public static final int RULE_SL_COMMENT=42; @@ -68,13 +68,13 @@ public InternalErDslLexer(CharStream input, RecognizerSharedState state) { } public String getGrammarFileName() { return "InternalErDslLexer.g"; } - // $ANTLR start "GenerateOcurrenceDiagram" - public final void mGenerateOcurrenceDiagram() throws RecognitionException { + // $ANTLR start "GenerateOccurrenceDiagram" + public final void mGenerateOccurrenceDiagram() throws RecognitionException { try { - int _type = GenerateOcurrenceDiagram; + int _type = GenerateOccurrenceDiagram; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalErDslLexer.g:14:26: ( '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ) - // InternalErDslLexer.g:14:28: '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) + // InternalErDslLexer.g:14:27: ( '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ) + // InternalErDslLexer.g:14:29: '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) { match('@'); if ( input.LA(1)=='G'||input.LA(1)=='g' ) { @@ -167,6 +167,15 @@ public final void mGenerateOcurrenceDiagram() throws RecognitionException { recover(mse); throw mse;} + if ( input.LA(1)=='C'||input.LA(1)=='c' ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + if ( input.LA(1)=='U'||input.LA(1)=='u' ) { input.consume(); @@ -302,7 +311,7 @@ public final void mGenerateOcurrenceDiagram() throws RecognitionException { finally { } } - // $ANTLR end "GenerateOcurrenceDiagram" + // $ANTLR end "GenerateOccurrenceDiagram" // $ANTLR start "PartialOverlapped" public final void mPartialOverlapped() throws RecognitionException { @@ -3213,292 +3222,292 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // InternalErDslLexer.g:1:8: ( GenerateOcurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + // InternalErDslLexer.g:1:8: ( GenerateOccurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) int alt12=41; alt12 = dfa12.predict(input); switch (alt12) { case 1 : - // InternalErDslLexer.g:1:10: GenerateOcurrenceDiagram + // InternalErDslLexer.g:1:10: GenerateOccurrenceDiagram { - mGenerateOcurrenceDiagram(); + mGenerateOccurrenceDiagram(); } break; case 2 : - // InternalErDslLexer.g:1:35: PartialOverlapped + // InternalErDslLexer.g:1:36: PartialOverlapped { mPartialOverlapped(); } break; case 3 : - // InternalErDslLexer.g:1:53: PartialDisjoint + // InternalErDslLexer.g:1:54: PartialDisjoint { mPartialDisjoint(); } break; case 4 : - // InternalErDslLexer.g:1:69: TotalOverlapped + // InternalErDslLexer.g:1:70: TotalOverlapped { mTotalOverlapped(); } break; case 5 : - // InternalErDslLexer.g:1:85: TotalDisjoint + // InternalErDslLexer.g:1:86: TotalDisjoint { mTotalDisjoint(); } break; case 6 : - // InternalErDslLexer.g:1:99: LogicalSchema + // InternalErDslLexer.g:1:100: LogicalSchema { mLogicalSchema(); } break; case 7 : - // InternalErDslLexer.g:1:113: Relationships + // InternalErDslLexer.g:1:114: Relationships { mRelationships(); } break; case 8 : - // InternalErDslLexer.g:1:127: IsIdentifier + // InternalErDslLexer.g:1:128: IsIdentifier { mIsIdentifier(); } break; case 9 : - // InternalErDslLexer.g:1:140: PostgreSQL + // InternalErDslLexer.g:1:141: PostgreSQL { mPostgreSQL(); } break; case 10 : - // InternalErDslLexer.g:1:151: Entities + // InternalErDslLexer.g:1:152: Entities { mEntities(); } break; case 11 : - // InternalErDslLexer.g:1:160: Generate + // InternalErDslLexer.g:1:161: Generate { mGenerate(); } break; case 12 : - // InternalErDslLexer.g:1:169: Datetime + // InternalErDslLexer.g:1:170: Datetime { mDatetime(); } break; case 13 : - // InternalErDslLexer.g:1:178: Diagram + // InternalErDslLexer.g:1:179: Diagram { mDiagram(); } break; case 14 : - // InternalErDslLexer.g:1:186: Boolean + // InternalErDslLexer.g:1:187: Boolean { mBoolean(); } break; case 15 : - // InternalErDslLexer.g:1:194: Relates + // InternalErDslLexer.g:1:195: Relates { mRelates(); } break; case 16 : - // InternalErDslLexer.g:1:202: Domain + // InternalErDslLexer.g:1:203: Domain { mDomain(); } break; case 17 : - // InternalErDslLexer.g:1:209: Double + // InternalErDslLexer.g:1:210: Double { mDouble(); } break; case 18 : - // InternalErDslLexer.g:1:216: String + // InternalErDslLexer.g:1:217: String { mString(); } break; case 19 : - // InternalErDslLexer.g:1:223: LeftParenthesisDigitZeroColonDigitOneRightParenthesis + // InternalErDslLexer.g:1:224: LeftParenthesisDigitZeroColonDigitOneRightParenthesis { mLeftParenthesisDigitZeroColonDigitOneRightParenthesis(); } break; case 20 : - // InternalErDslLexer.g:1:277: N + // InternalErDslLexer.g:1:278: N { mN(); } break; case 21 : - // InternalErDslLexer.g:1:279: LeftParenthesisDigitOneColonDigitOneRightParenthesis + // InternalErDslLexer.g:1:280: LeftParenthesisDigitOneColonDigitOneRightParenthesis { mLeftParenthesisDigitOneColonDigitOneRightParenthesis(); } break; case 22 : - // InternalErDslLexer.g:1:332: N_1 + // InternalErDslLexer.g:1:333: N_1 { mN_1(); } break; case 23 : - // InternalErDslLexer.g:1:336: MySQL + // InternalErDslLexer.g:1:337: MySQL { mMySQL(); } break; case 24 : - // InternalErDslLexer.g:1:342: Money + // InternalErDslLexer.g:1:343: Money { mMoney(); } break; case 25 : - // InternalErDslLexer.g:1:348: File + // InternalErDslLexer.g:1:349: File { mFile(); } break; case 26 : - // InternalErDslLexer.g:1:353: All + // InternalErDslLexer.g:1:354: All { mAll(); } break; case 27 : - // InternalErDslLexer.g:1:357: Int + // InternalErDslLexer.g:1:358: Int { mInt(); } break; case 28 : - // InternalErDslLexer.g:1:361: Is + // InternalErDslLexer.g:1:362: Is { mIs(); } break; case 29 : - // InternalErDslLexer.g:1:364: Comma + // InternalErDslLexer.g:1:365: Comma { mComma(); } break; case 30 : - // InternalErDslLexer.g:1:370: Semicolon + // InternalErDslLexer.g:1:371: Semicolon { mSemicolon(); } break; case 31 : - // InternalErDslLexer.g:1:380: LeftSquareBracket + // InternalErDslLexer.g:1:381: LeftSquareBracket { mLeftSquareBracket(); } break; case 32 : - // InternalErDslLexer.g:1:398: RightSquareBracket + // InternalErDslLexer.g:1:399: RightSquareBracket { mRightSquareBracket(); } break; case 33 : - // InternalErDslLexer.g:1:417: LeftCurlyBracket + // InternalErDslLexer.g:1:418: LeftCurlyBracket { mLeftCurlyBracket(); } break; case 34 : - // InternalErDslLexer.g:1:434: RightCurlyBracket + // InternalErDslLexer.g:1:435: RightCurlyBracket { mRightCurlyBracket(); } break; case 35 : - // InternalErDslLexer.g:1:452: RULE_ID + // InternalErDslLexer.g:1:453: RULE_ID { mRULE_ID(); } break; case 36 : - // InternalErDslLexer.g:1:460: RULE_INT + // InternalErDslLexer.g:1:461: RULE_INT { mRULE_INT(); } break; case 37 : - // InternalErDslLexer.g:1:469: RULE_STRING + // InternalErDslLexer.g:1:470: RULE_STRING { mRULE_STRING(); } break; case 38 : - // InternalErDslLexer.g:1:481: RULE_ML_COMMENT + // InternalErDslLexer.g:1:482: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 39 : - // InternalErDslLexer.g:1:497: RULE_SL_COMMENT + // InternalErDslLexer.g:1:498: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 40 : - // InternalErDslLexer.g:1:513: RULE_WS + // InternalErDslLexer.g:1:514: RULE_WS { mRULE_WS(); } break; case 41 : - // InternalErDslLexer.g:1:521: RULE_ANY_OTHER + // InternalErDslLexer.g:1:522: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -3750,7 +3759,7 @@ public DFA12(BaseRecognizer recognizer) { this.transition = DFA12_transition; } public String getDescription() { - return "1:1: Tokens : ( GenerateOcurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( GenerateOccurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; diff --git a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens index da340ad..7ae75a9 100644 --- a/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens +++ b/org.xtext.unipampa.erdsl.ide/src-gen/org/xtext/unipampa/erdsl/ide/contentassist/antlr/lexer/InternalErDslLexer.tokens @@ -8,7 +8,7 @@ Double=20 Entities=13 File=28 Generate=14 -GenerateOcurrenceDiagram=4 +GenerateOccurrenceDiagram=4 Int=30 Is=31 IsIdentifier=11 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 b8f1e2d..cb2b32f 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 b8f1e2d..cb2b32f 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 4e2a8d4..b564c87 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 61fe75f..02e5136 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 87003bf..83fda56 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/contentassist/AbstractErDslProposalProvider.class b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.class index 3092fe2..56d142b 100644 Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.class and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.class 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 14b0762..1b51ff6 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 88ad260..75d9667 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 a46ad47..ebd774a 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 9346229..06cf98d 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 0d013d0..bbd460c 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 18938bc..1849746 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/src-gen/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.java b/org.xtext.unipampa.erdsl.ui/src-gen/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.java index a8aeb7c..d0f91a3 100644 --- a/org.xtext.unipampa.erdsl.ui/src-gen/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.java +++ b/org.xtext.unipampa.erdsl.ui/src-gen/org/xtext/unipampa/erdsl/ui/contentassist/AbstractErDslProposalProvider.java @@ -73,7 +73,7 @@ public void completeRelation_RightEnding(EObject model, Assignment assignment, C public void completeRelation_Attributes(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeRelation_Ocurrence(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeRelation_Occurrence(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } public void completeRelationSideRight_Cardinality(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { 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 4e2a8d4..b564c87 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 61fe75f..02e5136 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 87003bf..83fda56 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 14b0762..1b51ff6 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 88ad260..75d9667 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 a46ad47..ebd774a 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 9346229..06cf98d 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 0d013d0..bbd460c 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 18938bc..1849746 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/ErDsl.xtext b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtext index c14c971..840d4a6 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtext +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtext @@ -24,7 +24,7 @@ Relation: 'relates' rightEnding=RelationSideRight ']') ('{' attributes+=Attribute - (',' attributes+=Attribute)* '}')* ocurrence=('@generateOcurrenceDiagram')?; + (',' attributes+=Attribute)* '}')* occurrence=('@generateOccurrenceDiagram')?; RelationSideRight: cardinality=('(0:1)' | '(1:1)' | '(0:N)' | '(1:N)') diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtextbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtextbin index 522ec87..026c1fe 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtextbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/ErDsl.xtextbin differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage$Literals.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage$Literals.class index 74039ef..706ee4b 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage$Literals.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage$Literals.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.class index 5c8672f..2596515 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/Relation.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/Relation.class index 9ac1ed2..19bfef0 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/Relation.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/Relation.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.class index e1a290b..e12e5be 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.class index e86c603..3abad83 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace index e4d6730..455c5e8 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace 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 3eabed1..d24ab65 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 263cedd..ee54889 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 788cfd6..01f62a1 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 new file mode 100644 index 0000000..8968ec1 Binary files /dev/null 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 new file mode 100644 index 0000000..119c7e7 Binary files /dev/null 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/.OcurrenceDiagramGenerator.java._trace b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.java._trace index b68eb65..cfa2cd3 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.java._trace and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.java._trace differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.xtendbin deleted file mode 100644 index 9bf62ed..0000000 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.xtendbin and /dev/null differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace index 355958b..08bf420 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace 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 6522b03..235b105 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 f991ee4..e0df51e 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/ErDslGenerator.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.class index 2598eef..0b373a7 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend index b24274d..fbee31c 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend @@ -20,7 +20,7 @@ class ErDslGenerator extends AbstractGenerator { val postGreSqlGenerator = new PostgresqlFileGenerator; val MySqlGenerator = new MysqlFileGenerator; val PlantUmlGenerator = new PlantUmlFileGenerator; - val OcurrenceDiagramGenerator = new OcurrenceDiagramGenerator; + val OcurrenceDiagramGenerator = new OccurrenceDiagramGenerator; override void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) { 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 new file mode 100644 index 0000000..d5bfc09 Binary files /dev/null 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 new file mode 100644 index 0000000..6bf8c36 --- /dev/null +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend @@ -0,0 +1,252 @@ +package org.xtext.unipampa.erdsl.generator + +import org.eclipse.xtext.generator.AbstractGenerator +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.xtext.generator.IFileSystemAccess2 +import org.eclipse.xtext.generator.IGeneratorContext +import org.xtext.unipampa.erdsl.erDsl.ERModel +import org.eclipse.xtext.generator.IFileSystemAccessExtension3 +import java.io.ByteArrayOutputStream +import net.sourceforge.plantuml.SourceStringReader +import java.io.ByteArrayInputStream +import org.xtext.unipampa.erdsl.erDsl.Relation + +class OccurrenceDiagramGenerator extends AbstractGenerator { + + var String currentRelationshipName = null; + + override doGenerate(Resource input, IFileSystemAccess2 fsa, IGeneratorContext context) { + + val modeloER = input.contents.get(0) as ERModel + + for (r : modeloER.relations.filter[i|i.occurrence !== null]) { + try { + + this.currentRelationshipName = r.name.toString + + for (diagramModel : input.contents.filter(typeof(ERModel))) { + val plantUML = diagramModel.plotToPlantUML.toString + + if (fsa instanceof IFileSystemAccessExtension3) { + + val out = new ByteArrayOutputStream() + + new SourceStringReader(plantUML).generateImage(out) + + (fsa as IFileSystemAccessExtension3).generateFile(r.name.toLowerCase + "_OccurrenceDiagram.png", + new ByteArrayInputStream(out.toByteArray)) + + fsa.generateFile(r.name.toLowerCase + "_OccurrenceDiagramDesc_Gen.puml", plantUML) + } else { + + fsa.generateFile(r.name.toLowerCase + "_OccurrenceDiagramDesc_PartialGen.puml", plantUML) + } + } + + } catch (Exception e) { + + println(e.stackTrace.toString) + + } + + this.currentRelationshipName = null + + } + + } + + def private CharSequence plotToPlantUML(ERModel it) ''' + @startuml + ' - Esconde os (*letra*) dos objetos (E para entidade, C para classe, O para objetos, etc) + ' hide circle + ' - workaround para evitar problemas com os angulos do crows foot + ' skinparam linetype ortho + skinparam titleBorderRoundCorner 15 + skinparam titleBorderThickness 1 + ' skinparam titleBorderColor red + ' skinparam titleBackgroundColor CadetBlue + scale 2.0 + ' skinparam monochrome true + header + Diagram generated by ERtext + endheader + right footer https://github.com/ProjetoDSL/ERDSL + title Occurrence Diagram\n«this.currentRelationshipName» + «FOR e : relations.filter[i|i.occurrence !== null]» + «IF e.name.equalsIgnoreCase(this.currentRelationshipName)» + «e.plotToPlantUML» + «ENDIF» + «ENDFOR» + @enduml + ''' + + 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 { + object x1_y1 + object x2_y3 + } + + A -- X + B -- Z + «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 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object X + object Y + object Z + } + + A -- X + B -- Z + «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 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality» { + object X + object Y + } + + A -- X + C -- Y + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x2_y2 + object x3_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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» + 1,1 - 1,n + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» + 1,n - 0,1 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» + 1,n - 1,1 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» + 0,1 - 0,n + «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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x1_y3 + object x2_y1 + 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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x1_y2 + object x1_y3 + object x2_y1 + object x2_y3 + 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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x2_y1 + object x3_y1 + object x1_y2 + 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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x2_y2 + object x1_y3 + object x2_y1 + 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 + «ENDIF» + ''' + + def private initDefaultObjects(Relation r) ''' + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + } + ''' + +} \ No newline at end of file diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.class deleted file mode 100644 index 9e290c1..0000000 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.class and /dev/null differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.xtend b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.xtend deleted file mode 100644 index fcb47c9..0000000 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.xtend +++ /dev/null @@ -1,27 +0,0 @@ -package org.xtext.unipampa.erdsl.generator - -import org.eclipse.xtext.generator.AbstractGenerator -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.xtext.generator.IFileSystemAccess2 -import org.eclipse.xtext.generator.IGeneratorContext -import org.xtext.unipampa.erdsl.erDsl.ERModel - -class OcurrenceDiagramGenerator extends AbstractGenerator { - - override doGenerate(Resource input, IFileSystemAccess2 fsa, IGeneratorContext context) { - - val modeloER = input.contents.get(0) as ERModel - - try { - fsa.generateFile(modeloER.domain.name.toLowerCase+'_OcurrenceDiagram.sql', ocurrence_CreateDiagram(modeloER)) - } catch (Exception e) { - println(e.stackTrace.toString) - } - - } - - def private ocurrence_CreateDiagram(ERModel modeloER) ''' - Test - ''' - -} \ No newline at end of file diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class index fce1647..c953324 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend index 3b8f040..d79ab03 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend @@ -32,7 +32,7 @@ class PlantUmlFileGenerator extends AbstractGenerator { new ByteArrayInputStream(out.toByteArray)) - fsa.generateFile(modeloER.domain.name.toLowerCase+"_DiagramDesc_Gen.puml", plantUML) +// fsa.generateFile(modeloER.domain.name.toLowerCase+"_DiagramDesc_Gen.puml", plantUML) } else { @@ -57,7 +57,7 @@ class PlantUmlFileGenerator extends AbstractGenerator { skinparam titleBorderRoundCorner 15 skinparam titleBorderThickness 1 ' skinparam titleBorderColor red - scale 1.0 + scale 1.5 ' skinparam monochrome true header Diagram generated by ERtext diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.class index e8a084c..545fd47 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g index 04402d4..ce6d924 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g @@ -656,15 +656,15 @@ ruleRelation returns [EObject current=null] )* ( ( - lv_ocurrence_11_0=GenerateOcurrenceDiagram + lv_occurrence_11_0=GenerateOccurrenceDiagram { - newLeafNode(lv_ocurrence_11_0, grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); + newLeafNode(lv_occurrence_11_0, grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } { if ($current==null) { $current = createModelElement(grammarAccess.getRelationRule()); } - setWithLastConsumed($current, "ocurrence", lv_ocurrence_11_0, "@generateOcurrenceDiagram"); + setWithLastConsumed($current, "occurrence", lv_occurrence_11_0, "@generateOccurrenceDiagram"); } ) )? diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens index 2e5643b..8442fb3 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens @@ -4,7 +4,7 @@ '(1:N)'=25 ','=32 ';'=33 -'@generateOcurrenceDiagram'=4 +'@generateOccurrenceDiagram'=4 'All'=29 'Diagram'=16 'Domain'=19 diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer$DFA12.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer$DFA12.class index a8872a5..46de4bb 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer$DFA12.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer$DFA12.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.class index ea48b5c..9df014c 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.class differ diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g index a91661d..c6d7923 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g @@ -11,7 +11,7 @@ package org.xtext.unipampa.erdsl.parser.antlr.lexer; import org.eclipse.xtext.parser.antlr.Lexer; } -GenerateOcurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); +GenerateOccurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); PartialOverlapped : ('P'|'p')('A'|'a')('R'|'r')('T'|'t')('I'|'i')('A'|'a')('L'|'l')'/'('O'|'o')('V'|'v')('E'|'e')('R'|'r')('L'|'l')('A'|'a')('P'|'p')('P'|'p')('E'|'e')('D'|'d'); diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens index da340ad..7ae75a9 100644 --- a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens +++ b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens @@ -8,7 +8,7 @@ Double=20 Entities=13 File=28 Generate=14 -GenerateOcurrenceDiagram=4 +GenerateOccurrenceDiagram=4 Int=30 Is=31 IsIdentifier=11 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 9039188..c9c8095 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/services/ErDslGrammarAccess$RelationElements.class b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess$RelationElements.class index bc9a587..58c4aa1 100644 Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess$RelationElements.class and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess$RelationElements.class differ diff --git a/org.xtext.unipampa.erdsl/model/generated/ErDsl.ecore b/org.xtext.unipampa.erdsl/model/generated/ErDsl.ecore index 95d72c2..8bd464f 100644 --- a/org.xtext.unipampa.erdsl/model/generated/ErDsl.ecore +++ b/org.xtext.unipampa.erdsl/model/generated/ErDsl.ecore @@ -33,7 +33,7 @@ containment="true"/> - + diff --git a/org.xtext.unipampa.erdsl/model/generated/ErDsl.genmodel b/org.xtext.unipampa.erdsl/model/generated/ErDsl.genmodel index 9140801..f39592e 100644 --- a/org.xtext.unipampa.erdsl/model/generated/ErDsl.genmodel +++ b/org.xtext.unipampa.erdsl/model/generated/ErDsl.genmodel @@ -40,7 +40,7 @@ - + diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/ErDsl.xtextbin b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/ErDsl.xtextbin index 522ec87..026c1fe 100644 Binary files a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/ErDsl.xtextbin and b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/ErDsl.xtextbin differ diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.java index cde0a0a..5f03297 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/ErDslPackage.java @@ -289,13 +289,13 @@ public interface ErDslPackage extends EPackage int RELATION__ATTRIBUTES = 3; /** - * The feature id for the 'Ocurrence' attribute. + * The feature id for the 'Occurrence' attribute. * * * @generated * @ordered */ - int RELATION__OCURRENCE = 4; + int RELATION__OCCURRENCE = 4; /** * The number of structural features of the 'Relation' class. @@ -618,15 +618,15 @@ public interface ErDslPackage extends EPackage EReference getRelation_Attributes(); /** - * Returns the meta object for the attribute '{@link org.xtext.unipampa.erdsl.erDsl.Relation#getOcurrence Ocurrence}'. + * Returns the meta object for the attribute '{@link org.xtext.unipampa.erdsl.erDsl.Relation#getOccurrence Occurrence}'. * * - * @return the meta object for the attribute 'Ocurrence'. - * @see org.xtext.unipampa.erdsl.erDsl.Relation#getOcurrence() + * @return the meta object for the attribute 'Occurrence'. + * @see org.xtext.unipampa.erdsl.erDsl.Relation#getOccurrence() * @see #getRelation() * @generated */ - EAttribute getRelation_Ocurrence(); + EAttribute getRelation_Occurrence(); /** * Returns the meta object for class '{@link org.xtext.unipampa.erdsl.erDsl.RelationSideRight Relation Side Right}'. @@ -904,12 +904,12 @@ interface Literals EReference RELATION__ATTRIBUTES = eINSTANCE.getRelation_Attributes(); /** - * The meta object literal for the 'Ocurrence' attribute feature. + * The meta object literal for the 'Occurrence' attribute feature. * * * @generated */ - EAttribute RELATION__OCURRENCE = eINSTANCE.getRelation_Ocurrence(); + EAttribute RELATION__OCCURRENCE = eINSTANCE.getRelation_Occurrence(); /** * The meta object literal for the '{@link org.xtext.unipampa.erdsl.erDsl.impl.RelationSideRightImpl Relation Side Right}' class. diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/Relation.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/Relation.java index 690b4b3..b087dcd 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/Relation.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/Relation.java @@ -20,7 +20,7 @@ *
  • {@link org.xtext.unipampa.erdsl.erDsl.Relation#getLeftEnding Left Ending}
    • *
  • {@link org.xtext.unipampa.erdsl.erDsl.Relation#getRightEnding Right Ending}
    • *
  • {@link org.xtext.unipampa.erdsl.erDsl.Relation#getAttributes Attributes}
    • - *
  • {@link org.xtext.unipampa.erdsl.erDsl.Relation#getOcurrence Ocurrence}
    • + *
  • {@link org.xtext.unipampa.erdsl.erDsl.Relation#getOccurrence Occurrence}
    • * * * @see org.xtext.unipampa.erdsl.erDsl.ErDslPackage#getRelation() @@ -108,25 +108,25 @@ public interface Relation extends EObject EList getAttributes(); /** - * Returns the value of the 'Ocurrence' attribute. + * Returns the value of the 'Occurrence' attribute. * * - * @return the value of the 'Ocurrence' attribute. - * @see #setOcurrence(String) - * @see org.xtext.unipampa.erdsl.erDsl.ErDslPackage#getRelation_Ocurrence() + * @return the value of the 'Occurrence' attribute. + * @see #setOccurrence(String) + * @see org.xtext.unipampa.erdsl.erDsl.ErDslPackage#getRelation_Occurrence() * @model * @generated */ - String getOcurrence(); + String getOccurrence(); /** - * Sets the value of the '{@link org.xtext.unipampa.erdsl.erDsl.Relation#getOcurrence Ocurrence}' attribute. + * Sets the value of the '{@link org.xtext.unipampa.erdsl.erDsl.Relation#getOccurrence Occurrence}' attribute. * * - * @param value the new value of the 'Ocurrence' attribute. - * @see #getOcurrence() + * @param value the new value of the 'Occurrence' attribute. + * @see #getOccurrence() * @generated */ - void setOcurrence(String value); + void setOccurrence(String value); } // Relation diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.java index cf52bbe..fcf52e9 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/ErDslPackageImpl.java @@ -386,7 +386,7 @@ public EReference getRelation_Attributes() * @generated */ @Override - public EAttribute getRelation_Ocurrence() + public EAttribute getRelation_Occurrence() { return (EAttribute)relationEClass.getEStructuralFeatures().get(4); } @@ -524,7 +524,7 @@ public void createPackageContents() createEReference(relationEClass, RELATION__LEFT_ENDING); createEReference(relationEClass, RELATION__RIGHT_ENDING); createEReference(relationEClass, RELATION__ATTRIBUTES); - createEAttribute(relationEClass, RELATION__OCURRENCE); + createEAttribute(relationEClass, RELATION__OCCURRENCE); relationSideRightEClass = createEClass(RELATION_SIDE_RIGHT); createEAttribute(relationSideRightEClass, RELATION_SIDE_RIGHT__CARDINALITY); @@ -594,7 +594,7 @@ public void initializePackageContents() initEReference(getRelation_LeftEnding(), this.getRelationSideLeft(), null, "leftEnding", null, 0, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRelation_RightEnding(), this.getRelationSideRight(), null, "rightEnding", null, 0, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getRelation_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRelation_Ocurrence(), ecorePackage.getEString(), "ocurrence", null, 0, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRelation_Occurrence(), ecorePackage.getEString(), "occurrence", null, 0, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(relationSideRightEClass, RelationSideRight.class, "RelationSideRight", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getRelationSideRight_Cardinality(), ecorePackage.getEString(), "cardinality", null, 0, 1, RelationSideRight.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.java index 1f105af..da71de8 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/erDsl/impl/RelationImpl.java @@ -37,7 +37,7 @@ *
  • {@link org.xtext.unipampa.erdsl.erDsl.impl.RelationImpl#getLeftEnding Left Ending}
    • *
  • {@link org.xtext.unipampa.erdsl.erDsl.impl.RelationImpl#getRightEnding Right Ending}
    • *
  • {@link org.xtext.unipampa.erdsl.erDsl.impl.RelationImpl#getAttributes Attributes}
    • - *
  • {@link org.xtext.unipampa.erdsl.erDsl.impl.RelationImpl#getOcurrence Ocurrence}
    • + *
  • {@link org.xtext.unipampa.erdsl.erDsl.impl.RelationImpl#getOccurrence Occurrence}
    • * * * @generated @@ -95,24 +95,24 @@ public class RelationImpl extends MinimalEObjectImpl.Container implements Relati protected EList attributes; /** - * The default value of the '{@link #getOcurrence() Ocurrence}' attribute. + * The default value of the '{@link #getOccurrence() Occurrence}' attribute. * * - * @see #getOcurrence() + * @see #getOccurrence() * @generated * @ordered */ - protected static final String OCURRENCE_EDEFAULT = null; + protected static final String OCCURRENCE_EDEFAULT = null; /** - * The cached value of the '{@link #getOcurrence() Ocurrence}' attribute. + * The cached value of the '{@link #getOccurrence() Occurrence}' attribute. * * - * @see #getOcurrence() + * @see #getOccurrence() * @generated * @ordered */ - protected String ocurrence = OCURRENCE_EDEFAULT; + protected String occurrence = OCCURRENCE_EDEFAULT; /** * @@ -281,9 +281,9 @@ public EList getAttributes() * @generated */ @Override - public String getOcurrence() + public String getOccurrence() { - return ocurrence; + return occurrence; } /** @@ -292,12 +292,12 @@ public String getOcurrence() * @generated */ @Override - public void setOcurrence(String newOcurrence) + public void setOccurrence(String newOccurrence) { - String oldOcurrence = ocurrence; - ocurrence = newOcurrence; + String oldOccurrence = occurrence; + occurrence = newOccurrence; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ErDslPackage.RELATION__OCURRENCE, oldOcurrence, ocurrence)); + eNotify(new ENotificationImpl(this, Notification.SET, ErDslPackage.RELATION__OCCURRENCE, oldOccurrence, occurrence)); } /** @@ -338,8 +338,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) return getRightEnding(); case ErDslPackage.RELATION__ATTRIBUTES: return getAttributes(); - case ErDslPackage.RELATION__OCURRENCE: - return getOcurrence(); + case ErDslPackage.RELATION__OCCURRENCE: + return getOccurrence(); } return super.eGet(featureID, resolve, coreType); } @@ -368,8 +368,8 @@ public void eSet(int featureID, Object newValue) getAttributes().clear(); getAttributes().addAll((Collection)newValue); return; - case ErDslPackage.RELATION__OCURRENCE: - setOcurrence((String)newValue); + case ErDslPackage.RELATION__OCCURRENCE: + setOccurrence((String)newValue); return; } super.eSet(featureID, newValue); @@ -397,8 +397,8 @@ public void eUnset(int featureID) case ErDslPackage.RELATION__ATTRIBUTES: getAttributes().clear(); return; - case ErDslPackage.RELATION__OCURRENCE: - setOcurrence(OCURRENCE_EDEFAULT); + case ErDslPackage.RELATION__OCCURRENCE: + setOccurrence(OCCURRENCE_EDEFAULT); return; } super.eUnset(featureID); @@ -422,8 +422,8 @@ public boolean eIsSet(int featureID) return rightEnding != null; case ErDslPackage.RELATION__ATTRIBUTES: return attributes != null && !attributes.isEmpty(); - case ErDslPackage.RELATION__OCURRENCE: - return OCURRENCE_EDEFAULT == null ? ocurrence != null : !OCURRENCE_EDEFAULT.equals(ocurrence); + case ErDslPackage.RELATION__OCCURRENCE: + return OCCURRENCE_EDEFAULT == null ? occurrence != null : !OCCURRENCE_EDEFAULT.equals(occurrence); } return super.eIsSet(featureID); } @@ -441,8 +441,8 @@ public String toString() // StringBuilder result = new StringBuilder(super.toString()); // result.append(" (name: "); // result.append(name); -// result.append(", ocurrence: "); -// result.append(ocurrence); +// result.append(", occurrence: "); +// result.append(occurrence); // result.append(')'); // return result.toString(); return name; diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g index 04402d4..ce6d924 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.g @@ -656,15 +656,15 @@ ruleRelation returns [EObject current=null] )* ( ( - lv_ocurrence_11_0=GenerateOcurrenceDiagram + lv_occurrence_11_0=GenerateOccurrenceDiagram { - newLeafNode(lv_ocurrence_11_0, grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); + newLeafNode(lv_occurrence_11_0, grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); } { if ($current==null) { $current = createModelElement(grammarAccess.getRelationRule()); } - setWithLastConsumed($current, "ocurrence", lv_ocurrence_11_0, "@generateOcurrenceDiagram"); + setWithLastConsumed($current, "occurrence", lv_occurrence_11_0, "@generateOccurrenceDiagram"); } ) )? diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.java index e203876..c02914c 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.java @@ -22,13 +22,14 @@ @SuppressWarnings("all") public class InternalErDslParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "GenerateOcurrenceDiagram", "PartialOverlapped", "PartialDisjoint", "TotalOverlapped", "TotalDisjoint", "LogicalSchema", "Relationships", "IsIdentifier", "PostgreSQL", "Entities", "Generate", "Datetime", "Diagram", "Boolean", "Relates", "Domain", "Double", "String", "LeftParenthesisDigitZeroColonDigitOneRightParenthesis", "N", "LeftParenthesisDigitOneColonDigitOneRightParenthesis", "N_1", "MySQL", "Money", "File", "All", "Int", "Is", "Comma", "Semicolon", "LeftSquareBracket", "RightSquareBracket", "LeftCurlyBracket", "RightCurlyBracket", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER" + "", "", "", "", "GenerateOccurrenceDiagram", "PartialOverlapped", "PartialDisjoint", "TotalOverlapped", "TotalDisjoint", "LogicalSchema", "Relationships", "IsIdentifier", "PostgreSQL", "Entities", "Generate", "Datetime", "Diagram", "Boolean", "Relates", "Domain", "Double", "String", "LeftParenthesisDigitZeroColonDigitOneRightParenthesis", "N", "LeftParenthesisDigitOneColonDigitOneRightParenthesis", "N_1", "MySQL", "Money", "File", "All", "Int", "Is", "Comma", "Semicolon", "LeftSquareBracket", "RightSquareBracket", "LeftCurlyBracket", "RightCurlyBracket", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER" }; public static final int All=29; public static final int N_1=25; public static final int PostgreSQL=12; public static final int String=21; public static final int TotalOverlapped=7; + public static final int GenerateOccurrenceDiagram=4; public static final int MySQL=26; public static final int Boolean=17; public static final int RightSquareBracket=35; @@ -47,7 +48,6 @@ public class InternalErDslParser extends AbstractInternalAntlrParser { public static final int Is=31; public static final int RULE_STRING=40; public static final int LeftParenthesisDigitZeroColonDigitOneRightParenthesis=22; - public static final int GenerateOcurrenceDiagram=4; public static final int N=23; public static final int Int=30; public static final int RULE_SL_COMMENT=42; @@ -1244,7 +1244,7 @@ public final EObject entryRuleRelation() throws RecognitionException { // $ANTLR start "ruleRelation" - // InternalErDslParser.g:525:1: ruleRelation returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) )? ) ; + // InternalErDslParser.g:525:1: ruleRelation returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_occurrence_11_0= GenerateOccurrenceDiagram ) )? ) ; public final EObject ruleRelation() throws RecognitionException { EObject current = null; @@ -1255,7 +1255,7 @@ public final EObject ruleRelation() throws RecognitionException { Token otherlv_6=null; Token otherlv_8=null; Token otherlv_10=null; - Token lv_ocurrence_11_0=null; + Token lv_occurrence_11_0=null; EObject lv_leftEnding_2_0 = null; EObject lv_rightEnding_4_0 = null; @@ -1269,11 +1269,11 @@ public final EObject ruleRelation() throws RecognitionException { enterRule(); try { - // InternalErDslParser.g:531:2: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) )? ) ) - // InternalErDslParser.g:532:2: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) )? ) + // InternalErDslParser.g:531:2: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_occurrence_11_0= GenerateOccurrenceDiagram ) )? ) ) + // InternalErDslParser.g:532:2: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_occurrence_11_0= GenerateOccurrenceDiagram ) )? ) { - // InternalErDslParser.g:532:2: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) )? ) - // InternalErDslParser.g:533:3: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) )? + // InternalErDslParser.g:532:2: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_occurrence_11_0= GenerateOccurrenceDiagram ) )? ) + // InternalErDslParser.g:533:3: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= LeftSquareBracket ( (lv_leftEnding_2_0= ruleRelationSideLeft ) ) otherlv_3= Relates ( (lv_rightEnding_4_0= ruleRelationSideRight ) ) otherlv_5= RightSquareBracket ) (otherlv_6= LeftCurlyBracket ( (lv_attributes_7_0= ruleAttribute ) ) (otherlv_8= Comma ( (lv_attributes_9_0= ruleAttribute ) ) )* otherlv_10= RightCurlyBracket )* ( (lv_occurrence_11_0= GenerateOccurrenceDiagram ) )? { // InternalErDslParser.g:533:3: ( (lv_name_0_0= RULE_ID ) ) // InternalErDslParser.g:534:4: (lv_name_0_0= RULE_ID ) @@ -1503,29 +1503,29 @@ public final EObject ruleRelation() throws RecognitionException { } } while (true); - // InternalErDslParser.g:657:3: ( (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) )? + // InternalErDslParser.g:657:3: ( (lv_occurrence_11_0= GenerateOccurrenceDiagram ) )? int alt12=2; int LA12_0 = input.LA(1); - if ( (LA12_0==GenerateOcurrenceDiagram) ) { + if ( (LA12_0==GenerateOccurrenceDiagram) ) { alt12=1; } switch (alt12) { case 1 : - // InternalErDslParser.g:658:4: (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) + // InternalErDslParser.g:658:4: (lv_occurrence_11_0= GenerateOccurrenceDiagram ) { - // InternalErDslParser.g:658:4: (lv_ocurrence_11_0= GenerateOcurrenceDiagram ) - // InternalErDslParser.g:659:5: lv_ocurrence_11_0= GenerateOcurrenceDiagram + // InternalErDslParser.g:658:4: (lv_occurrence_11_0= GenerateOccurrenceDiagram ) + // InternalErDslParser.g:659:5: lv_occurrence_11_0= GenerateOccurrenceDiagram { - lv_ocurrence_11_0=(Token)match(input,GenerateOcurrenceDiagram,FOLLOW_2); + lv_occurrence_11_0=(Token)match(input,GenerateOccurrenceDiagram,FOLLOW_2); - newLeafNode(lv_ocurrence_11_0, grammarAccess.getRelationAccess().getOcurrenceGenerateOcurrenceDiagramKeyword_3_0()); + newLeafNode(lv_occurrence_11_0, grammarAccess.getRelationAccess().getOccurrenceGenerateOccurrenceDiagramKeyword_3_0()); if (current==null) { current = createModelElement(grammarAccess.getRelationRule()); } - setWithLastConsumed(current, "ocurrence", lv_ocurrence_11_0, "@generateOcurrenceDiagram"); + setWithLastConsumed(current, "occurrence", lv_occurrence_11_0, "@generateOccurrenceDiagram"); } diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens index 2e5643b..8442fb3 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/internal/InternalErDslParser.tokens @@ -4,7 +4,7 @@ '(1:N)'=25 ','=32 ';'=33 -'@generateOcurrenceDiagram'=4 +'@generateOccurrenceDiagram'=4 'All'=29 'Diagram'=16 'Domain'=19 diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g index a91661d..c6d7923 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.g @@ -11,7 +11,7 @@ package org.xtext.unipampa.erdsl.parser.antlr.lexer; import org.eclipse.xtext.parser.antlr.Lexer; } -GenerateOcurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); +GenerateOccurrenceDiagram : '@'('G'|'g')('E'|'e')('N'|'n')('E'|'e')('R'|'r')('A'|'a')('T'|'t')('E'|'e')('O'|'o')('C'|'c')('C'|'c')('U'|'u')('R'|'r')('R'|'r')('E'|'e')('N'|'n')('C'|'c')('E'|'e')('D'|'d')('I'|'i')('A'|'a')('G'|'g')('R'|'r')('A'|'a')('M'|'m'); PartialOverlapped : ('P'|'p')('A'|'a')('R'|'r')('T'|'t')('I'|'i')('A'|'a')('L'|'l')'/'('O'|'o')('V'|'v')('E'|'e')('R'|'r')('L'|'l')('A'|'a')('P'|'p')('P'|'p')('E'|'e')('D'|'d'); diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.java index ddf299b..fdd78dc 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.java @@ -17,6 +17,7 @@ public class InternalErDslLexer extends Lexer { public static final int PostgreSQL=12; public static final int String=21; public static final int TotalOverlapped=7; + public static final int GenerateOccurrenceDiagram=4; public static final int MySQL=26; public static final int Boolean=17; public static final int RightSquareBracket=35; @@ -35,7 +36,6 @@ public class InternalErDslLexer extends Lexer { public static final int Is=31; public static final int RULE_STRING=40; public static final int LeftParenthesisDigitZeroColonDigitOneRightParenthesis=22; - public static final int GenerateOcurrenceDiagram=4; public static final int N=23; public static final int Int=30; public static final int RULE_SL_COMMENT=42; @@ -68,13 +68,13 @@ public InternalErDslLexer(CharStream input, RecognizerSharedState state) { } public String getGrammarFileName() { return "InternalErDslLexer.g"; } - // $ANTLR start "GenerateOcurrenceDiagram" - public final void mGenerateOcurrenceDiagram() throws RecognitionException { + // $ANTLR start "GenerateOccurrenceDiagram" + public final void mGenerateOccurrenceDiagram() throws RecognitionException { try { - int _type = GenerateOcurrenceDiagram; + int _type = GenerateOccurrenceDiagram; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalErDslLexer.g:14:26: ( '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ) - // InternalErDslLexer.g:14:28: '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) + // InternalErDslLexer.g:14:27: ( '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) ) + // InternalErDslLexer.g:14:29: '@' ( 'G' | 'g' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'E' | 'e' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'T' | 't' ) ( 'E' | 'e' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'C' | 'c' ) ( 'U' | 'u' ) ( 'R' | 'r' ) ( 'R' | 'r' ) ( 'E' | 'e' ) ( 'N' | 'n' ) ( 'C' | 'c' ) ( 'E' | 'e' ) ( 'D' | 'd' ) ( 'I' | 'i' ) ( 'A' | 'a' ) ( 'G' | 'g' ) ( 'R' | 'r' ) ( 'A' | 'a' ) ( 'M' | 'm' ) { match('@'); if ( input.LA(1)=='G'||input.LA(1)=='g' ) { @@ -167,6 +167,15 @@ public final void mGenerateOcurrenceDiagram() throws RecognitionException { recover(mse); throw mse;} + if ( input.LA(1)=='C'||input.LA(1)=='c' ) { + input.consume(); + + } + else { + MismatchedSetException mse = new MismatchedSetException(null,input); + recover(mse); + throw mse;} + if ( input.LA(1)=='U'||input.LA(1)=='u' ) { input.consume(); @@ -302,7 +311,7 @@ public final void mGenerateOcurrenceDiagram() throws RecognitionException { finally { } } - // $ANTLR end "GenerateOcurrenceDiagram" + // $ANTLR end "GenerateOccurrenceDiagram" // $ANTLR start "PartialOverlapped" public final void mPartialOverlapped() throws RecognitionException { @@ -3213,292 +3222,292 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // InternalErDslLexer.g:1:8: ( GenerateOcurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + // InternalErDslLexer.g:1:8: ( GenerateOccurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) int alt12=41; alt12 = dfa12.predict(input); switch (alt12) { case 1 : - // InternalErDslLexer.g:1:10: GenerateOcurrenceDiagram + // InternalErDslLexer.g:1:10: GenerateOccurrenceDiagram { - mGenerateOcurrenceDiagram(); + mGenerateOccurrenceDiagram(); } break; case 2 : - // InternalErDslLexer.g:1:35: PartialOverlapped + // InternalErDslLexer.g:1:36: PartialOverlapped { mPartialOverlapped(); } break; case 3 : - // InternalErDslLexer.g:1:53: PartialDisjoint + // InternalErDslLexer.g:1:54: PartialDisjoint { mPartialDisjoint(); } break; case 4 : - // InternalErDslLexer.g:1:69: TotalOverlapped + // InternalErDslLexer.g:1:70: TotalOverlapped { mTotalOverlapped(); } break; case 5 : - // InternalErDslLexer.g:1:85: TotalDisjoint + // InternalErDslLexer.g:1:86: TotalDisjoint { mTotalDisjoint(); } break; case 6 : - // InternalErDslLexer.g:1:99: LogicalSchema + // InternalErDslLexer.g:1:100: LogicalSchema { mLogicalSchema(); } break; case 7 : - // InternalErDslLexer.g:1:113: Relationships + // InternalErDslLexer.g:1:114: Relationships { mRelationships(); } break; case 8 : - // InternalErDslLexer.g:1:127: IsIdentifier + // InternalErDslLexer.g:1:128: IsIdentifier { mIsIdentifier(); } break; case 9 : - // InternalErDslLexer.g:1:140: PostgreSQL + // InternalErDslLexer.g:1:141: PostgreSQL { mPostgreSQL(); } break; case 10 : - // InternalErDslLexer.g:1:151: Entities + // InternalErDslLexer.g:1:152: Entities { mEntities(); } break; case 11 : - // InternalErDslLexer.g:1:160: Generate + // InternalErDslLexer.g:1:161: Generate { mGenerate(); } break; case 12 : - // InternalErDslLexer.g:1:169: Datetime + // InternalErDslLexer.g:1:170: Datetime { mDatetime(); } break; case 13 : - // InternalErDslLexer.g:1:178: Diagram + // InternalErDslLexer.g:1:179: Diagram { mDiagram(); } break; case 14 : - // InternalErDslLexer.g:1:186: Boolean + // InternalErDslLexer.g:1:187: Boolean { mBoolean(); } break; case 15 : - // InternalErDslLexer.g:1:194: Relates + // InternalErDslLexer.g:1:195: Relates { mRelates(); } break; case 16 : - // InternalErDslLexer.g:1:202: Domain + // InternalErDslLexer.g:1:203: Domain { mDomain(); } break; case 17 : - // InternalErDslLexer.g:1:209: Double + // InternalErDslLexer.g:1:210: Double { mDouble(); } break; case 18 : - // InternalErDslLexer.g:1:216: String + // InternalErDslLexer.g:1:217: String { mString(); } break; case 19 : - // InternalErDslLexer.g:1:223: LeftParenthesisDigitZeroColonDigitOneRightParenthesis + // InternalErDslLexer.g:1:224: LeftParenthesisDigitZeroColonDigitOneRightParenthesis { mLeftParenthesisDigitZeroColonDigitOneRightParenthesis(); } break; case 20 : - // InternalErDslLexer.g:1:277: N + // InternalErDslLexer.g:1:278: N { mN(); } break; case 21 : - // InternalErDslLexer.g:1:279: LeftParenthesisDigitOneColonDigitOneRightParenthesis + // InternalErDslLexer.g:1:280: LeftParenthesisDigitOneColonDigitOneRightParenthesis { mLeftParenthesisDigitOneColonDigitOneRightParenthesis(); } break; case 22 : - // InternalErDslLexer.g:1:332: N_1 + // InternalErDslLexer.g:1:333: N_1 { mN_1(); } break; case 23 : - // InternalErDslLexer.g:1:336: MySQL + // InternalErDslLexer.g:1:337: MySQL { mMySQL(); } break; case 24 : - // InternalErDslLexer.g:1:342: Money + // InternalErDslLexer.g:1:343: Money { mMoney(); } break; case 25 : - // InternalErDslLexer.g:1:348: File + // InternalErDslLexer.g:1:349: File { mFile(); } break; case 26 : - // InternalErDslLexer.g:1:353: All + // InternalErDslLexer.g:1:354: All { mAll(); } break; case 27 : - // InternalErDslLexer.g:1:357: Int + // InternalErDslLexer.g:1:358: Int { mInt(); } break; case 28 : - // InternalErDslLexer.g:1:361: Is + // InternalErDslLexer.g:1:362: Is { mIs(); } break; case 29 : - // InternalErDslLexer.g:1:364: Comma + // InternalErDslLexer.g:1:365: Comma { mComma(); } break; case 30 : - // InternalErDslLexer.g:1:370: Semicolon + // InternalErDslLexer.g:1:371: Semicolon { mSemicolon(); } break; case 31 : - // InternalErDslLexer.g:1:380: LeftSquareBracket + // InternalErDslLexer.g:1:381: LeftSquareBracket { mLeftSquareBracket(); } break; case 32 : - // InternalErDslLexer.g:1:398: RightSquareBracket + // InternalErDslLexer.g:1:399: RightSquareBracket { mRightSquareBracket(); } break; case 33 : - // InternalErDslLexer.g:1:417: LeftCurlyBracket + // InternalErDslLexer.g:1:418: LeftCurlyBracket { mLeftCurlyBracket(); } break; case 34 : - // InternalErDslLexer.g:1:434: RightCurlyBracket + // InternalErDslLexer.g:1:435: RightCurlyBracket { mRightCurlyBracket(); } break; case 35 : - // InternalErDslLexer.g:1:452: RULE_ID + // InternalErDslLexer.g:1:453: RULE_ID { mRULE_ID(); } break; case 36 : - // InternalErDslLexer.g:1:460: RULE_INT + // InternalErDslLexer.g:1:461: RULE_INT { mRULE_INT(); } break; case 37 : - // InternalErDslLexer.g:1:469: RULE_STRING + // InternalErDslLexer.g:1:470: RULE_STRING { mRULE_STRING(); } break; case 38 : - // InternalErDslLexer.g:1:481: RULE_ML_COMMENT + // InternalErDslLexer.g:1:482: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 39 : - // InternalErDslLexer.g:1:497: RULE_SL_COMMENT + // InternalErDslLexer.g:1:498: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 40 : - // InternalErDslLexer.g:1:513: RULE_WS + // InternalErDslLexer.g:1:514: RULE_WS { mRULE_WS(); } break; case 41 : - // InternalErDslLexer.g:1:521: RULE_ANY_OTHER + // InternalErDslLexer.g:1:522: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -3750,7 +3759,7 @@ public DFA12(BaseRecognizer recognizer) { this.transition = DFA12_transition; } public String getDescription() { - return "1:1: Tokens : ( GenerateOcurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( GenerateOccurrenceDiagram | PartialOverlapped | PartialDisjoint | TotalOverlapped | TotalDisjoint | LogicalSchema | Relationships | IsIdentifier | PostgreSQL | Entities | Generate | Datetime | Diagram | Boolean | Relates | Domain | Double | String | LeftParenthesisDigitZeroColonDigitOneRightParenthesis | N | LeftParenthesisDigitOneColonDigitOneRightParenthesis | N_1 | MySQL | Money | File | All | Int | Is | Comma | Semicolon | LeftSquareBracket | RightSquareBracket | LeftCurlyBracket | RightCurlyBracket | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens index da340ad..7ae75a9 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/parser/antlr/lexer/InternalErDslLexer.tokens @@ -8,7 +8,7 @@ Double=20 Entities=13 File=28 Generate=14 -GenerateOcurrenceDiagram=4 +GenerateOccurrenceDiagram=4 Int=30 Is=31 IsIdentifier=11 diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/serializer/ErDslSemanticSequencer.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/serializer/ErDslSemanticSequencer.java index ed33874..7959ad8 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/serializer/ErDslSemanticSequencer.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/serializer/ErDslSemanticSequencer.java @@ -164,7 +164,7 @@ protected void sequence_RelationSideRight(ISerializationContext context, Relatio * leftEnding=RelationSideLeft * rightEnding=RelationSideRight * (attributes+=Attribute attributes+=Attribute*)* - * ocurrence='@generateOcurrenceDiagram'? + * occurrence='@generateOccurrenceDiagram'? * ) */ protected void sequence_Relation(ISerializationContext context, Relation semanticObject) { diff --git a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess.java b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess.java index 9dbf742..8fece21 100644 --- a/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess.java +++ b/org.xtext.unipampa.erdsl/src-gen/org/xtext/unipampa/erdsl/services/ErDslGrammarAccess.java @@ -342,22 +342,22 @@ public class RelationElements extends AbstractParserRuleElementFinder { private final Assignment cAttributesAssignment_2_2_1 = (Assignment)cGroup_2_2.eContents().get(1); private final RuleCall cAttributesAttributeParserRuleCall_2_2_1_0 = (RuleCall)cAttributesAssignment_2_2_1.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_2_3 = (Keyword)cGroup_2.eContents().get(3); - private final Assignment cOcurrenceAssignment_3 = (Assignment)cGroup.eContents().get(3); - private final Keyword cOcurrenceGenerateOcurrenceDiagramKeyword_3_0 = (Keyword)cOcurrenceAssignment_3.eContents().get(0); + private final Assignment cOccurrenceAssignment_3 = (Assignment)cGroup.eContents().get(3); + private final Keyword cOccurrenceGenerateOccurrenceDiagramKeyword_3_0 = (Keyword)cOccurrenceAssignment_3.eContents().get(0); //Relation: // (name=ID) ('[' leftEnding=RelationSideLeft // 'relates' // rightEnding=RelationSideRight ']') // ('{' attributes+=Attribute - // (',' attributes+=Attribute)* '}')* ocurrence=('@generateOcurrenceDiagram')?; + // (',' attributes+=Attribute)* '}')* occurrence=('@generateOccurrenceDiagram')?; @Override public ParserRule getRule() { return rule; } //(name=ID) ('[' leftEnding=RelationSideLeft //'relates' //rightEnding=RelationSideRight ']') //('{' attributes+=Attribute - //(',' attributes+=Attribute)* '}')* ocurrence=('@generateOcurrenceDiagram')? + //(',' attributes+=Attribute)* '}')* occurrence=('@generateOccurrenceDiagram')? public Group getGroup() { return cGroup; } //(name=ID) @@ -420,11 +420,11 @@ public class RelationElements extends AbstractParserRuleElementFinder { //'}' public Keyword getRightCurlyBracketKeyword_2_3() { return cRightCurlyBracketKeyword_2_3; } - //ocurrence=('@generateOcurrenceDiagram')? - public Assignment getOcurrenceAssignment_3() { return cOcurrenceAssignment_3; } + //occurrence=('@generateOccurrenceDiagram')? + public Assignment getOccurrenceAssignment_3() { return cOccurrenceAssignment_3; } - //('@generateOcurrenceDiagram') - public Keyword getOcurrenceGenerateOcurrenceDiagramKeyword_3_0() { return cOcurrenceGenerateOcurrenceDiagramKeyword_3_0; } + //('@generateOccurrenceDiagram') + public Keyword getOccurrenceGenerateOccurrenceDiagramKeyword_3_0() { return cOccurrenceGenerateOccurrenceDiagramKeyword_3_0; } } public class RelationSideRightElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.xtext.unipampa.erdsl.ErDsl.RelationSideRight"); @@ -738,7 +738,7 @@ public ParserRule getEntityRule() { // 'relates' // rightEnding=RelationSideRight ']') // ('{' attributes+=Attribute - // (',' attributes+=Attribute)* '}')* ocurrence=('@generateOcurrenceDiagram')?; + // (',' attributes+=Attribute)* '}')* occurrence=('@generateOccurrenceDiagram')?; public RelationElements getRelationAccess() { return pRelation; } diff --git a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/ErDsl.xtext b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/ErDsl.xtext index c14c971..840d4a6 100644 --- a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/ErDsl.xtext +++ b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/ErDsl.xtext @@ -24,7 +24,7 @@ Relation: 'relates' rightEnding=RelationSideRight ']') ('{' attributes+=Attribute - (',' attributes+=Attribute)* '}')* ocurrence=('@generateOcurrenceDiagram')?; + (',' attributes+=Attribute)* '}')* occurrence=('@generateOccurrenceDiagram')?; RelationSideRight: cardinality=('(0:1)' | '(1:1)' | '(0:N)' | '(1:N)') diff --git a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend index b24274d..fbee31c 100644 --- a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend +++ b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/ErDslGenerator.xtend @@ -20,7 +20,7 @@ class ErDslGenerator extends AbstractGenerator { val postGreSqlGenerator = new PostgresqlFileGenerator; val MySqlGenerator = new MysqlFileGenerator; val PlantUmlGenerator = new PlantUmlFileGenerator; - val OcurrenceDiagramGenerator = new OcurrenceDiagramGenerator; + val OcurrenceDiagramGenerator = new OccurrenceDiagramGenerator; override void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) { 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 new file mode 100644 index 0000000..6bf8c36 --- /dev/null +++ b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.xtend @@ -0,0 +1,252 @@ +package org.xtext.unipampa.erdsl.generator + +import org.eclipse.xtext.generator.AbstractGenerator +import org.eclipse.emf.ecore.resource.Resource +import org.eclipse.xtext.generator.IFileSystemAccess2 +import org.eclipse.xtext.generator.IGeneratorContext +import org.xtext.unipampa.erdsl.erDsl.ERModel +import org.eclipse.xtext.generator.IFileSystemAccessExtension3 +import java.io.ByteArrayOutputStream +import net.sourceforge.plantuml.SourceStringReader +import java.io.ByteArrayInputStream +import org.xtext.unipampa.erdsl.erDsl.Relation + +class OccurrenceDiagramGenerator extends AbstractGenerator { + + var String currentRelationshipName = null; + + override doGenerate(Resource input, IFileSystemAccess2 fsa, IGeneratorContext context) { + + val modeloER = input.contents.get(0) as ERModel + + for (r : modeloER.relations.filter[i|i.occurrence !== null]) { + try { + + this.currentRelationshipName = r.name.toString + + for (diagramModel : input.contents.filter(typeof(ERModel))) { + val plantUML = diagramModel.plotToPlantUML.toString + + if (fsa instanceof IFileSystemAccessExtension3) { + + val out = new ByteArrayOutputStream() + + new SourceStringReader(plantUML).generateImage(out) + + (fsa as IFileSystemAccessExtension3).generateFile(r.name.toLowerCase + "_OccurrenceDiagram.png", + new ByteArrayInputStream(out.toByteArray)) + + fsa.generateFile(r.name.toLowerCase + "_OccurrenceDiagramDesc_Gen.puml", plantUML) + } else { + + fsa.generateFile(r.name.toLowerCase + "_OccurrenceDiagramDesc_PartialGen.puml", plantUML) + } + } + + } catch (Exception e) { + + println(e.stackTrace.toString) + + } + + this.currentRelationshipName = null + + } + + } + + def private CharSequence plotToPlantUML(ERModel it) ''' + @startuml + ' - Esconde os (*letra*) dos objetos (E para entidade, C para classe, O para objetos, etc) + ' hide circle + ' - workaround para evitar problemas com os angulos do crows foot + ' skinparam linetype ortho + skinparam titleBorderRoundCorner 15 + skinparam titleBorderThickness 1 + ' skinparam titleBorderColor red + ' skinparam titleBackgroundColor CadetBlue + scale 2.0 + ' skinparam monochrome true + header + Diagram generated by ERtext + endheader + right footer https://github.com/ProjetoDSL/ERDSL + title Occurrence Diagram\n«this.currentRelationshipName» + «FOR e : relations.filter[i|i.occurrence !== null]» + «IF e.name.equalsIgnoreCase(this.currentRelationshipName)» + «e.plotToPlantUML» + «ENDIF» + «ENDFOR» + @enduml + ''' + + 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 { + object x1_y1 + object x2_y3 + } + + A -- X + B -- Z + «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 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality»{ + object X + object Y + object Z + } + + A -- X + B -- Z + «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 + } + + package «r.rightEnding.target.toString»«r.rightEnding.cardinality» { + object X + object Y + } + + A -- X + C -- Y + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x2_y2 + object x3_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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» + 1,1 - 1,n + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:1)")» + 1,n - 0,1 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:1)")» + 1,n - 1,1 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:1)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» + 0,1 - 0,n + «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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x1_y3 + object x2_y1 + 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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x1_y2 + object x1_y3 + object x2_y1 + object x2_y3 + 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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(0:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(1:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x2_y1 + object x3_y1 + object x1_y2 + 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 + «ELSEIF r.leftEnding.cardinality.equalsIgnoreCase("(1:N)") && r.rightEnding.cardinality.equalsIgnoreCase("(0:N)")» + «initDefaultObjects(r)» + package relationship { + object x1_y1 + object x2_y2 + object x1_y3 + object x2_y1 + 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 + «ENDIF» + ''' + + def private initDefaultObjects(Relation r) ''' + package «r.leftEnding.target.toString»«r.leftEnding.cardinality» { + object x1 + object x2 + object x3 + } + + package «r.rightEnding.cardinality»«r.rightEnding.target.toString» { + object y1 + object y2 + object y3 + } + ''' + +} \ No newline at end of file diff --git a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.xtend b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.xtend deleted file mode 100644 index fcb47c9..0000000 --- a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.xtend +++ /dev/null @@ -1,27 +0,0 @@ -package org.xtext.unipampa.erdsl.generator - -import org.eclipse.xtext.generator.AbstractGenerator -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.xtext.generator.IFileSystemAccess2 -import org.eclipse.xtext.generator.IGeneratorContext -import org.xtext.unipampa.erdsl.erDsl.ERModel - -class OcurrenceDiagramGenerator extends AbstractGenerator { - - override doGenerate(Resource input, IFileSystemAccess2 fsa, IGeneratorContext context) { - - val modeloER = input.contents.get(0) as ERModel - - try { - fsa.generateFile(modeloER.domain.name.toLowerCase+'_OcurrenceDiagram.sql', ocurrence_CreateDiagram(modeloER)) - } catch (Exception e) { - println(e.stackTrace.toString) - } - - } - - def private ocurrence_CreateDiagram(ERModel modeloER) ''' - Test - ''' - -} \ No newline at end of file diff --git a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend index 3b8f040..d79ab03 100644 --- a/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend +++ b/org.xtext.unipampa.erdsl/src/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.xtend @@ -32,7 +32,7 @@ class PlantUmlFileGenerator extends AbstractGenerator { new ByteArrayInputStream(out.toByteArray)) - fsa.generateFile(modeloER.domain.name.toLowerCase+"_DiagramDesc_Gen.puml", plantUML) +// fsa.generateFile(modeloER.domain.name.toLowerCase+"_DiagramDesc_Gen.puml", plantUML) } else { @@ -57,7 +57,7 @@ class PlantUmlFileGenerator extends AbstractGenerator { skinparam titleBorderRoundCorner 15 skinparam titleBorderThickness 1 ' skinparam titleBorderColor red - scale 1.0 + scale 1.5 ' skinparam monochrome true header Diagram generated by ERtext diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace index e4d6730..455c5e8 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.ErDslGenerator.java._trace 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 3eabed1..d24ab65 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 263cedd..ee54889 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 788cfd6..01f62a1 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 new file mode 100644 index 0000000..8968ec1 Binary files /dev/null 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 new file mode 100644 index 0000000..119c7e7 Binary files /dev/null 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/.OcurrenceDiagramGenerator.java._trace b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.java._trace index b68eb65..cfa2cd3 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.java._trace and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.java._trace differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.xtendbin deleted file mode 100644 index 9bf62ed..0000000 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OcurrenceDiagramGenerator.xtendbin and /dev/null differ diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace index 355958b..08bf420 100644 Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.PlantUmlFileGenerator.java._trace 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 6522b03..235b105 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 f991ee4..e0df51e 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/ErDslGenerator.java b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/ErDslGenerator.java index bf9e902..351b892 100644 --- a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/ErDslGenerator.java +++ b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/ErDslGenerator.java @@ -30,7 +30,7 @@ public class ErDslGenerator extends AbstractGenerator { private final PlantUmlFileGenerator PlantUmlGenerator = new PlantUmlFileGenerator(); - private final OcurrenceDiagramGenerator OcurrenceDiagramGenerator = new org.xtext.unipampa.erdsl.generator.OcurrenceDiagramGenerator(); + private final OccurrenceDiagramGenerator OcurrenceDiagramGenerator = new OccurrenceDiagramGenerator(); @Override public void doGenerate(final Resource resource, final IFileSystemAccess2 fsa, final IGeneratorContext context) { 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 new file mode 100644 index 0000000..6734b1e --- /dev/null +++ b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OccurrenceDiagramGenerator.java @@ -0,0 +1,553 @@ +package org.xtext.unipampa.erdsl.generator; + +import com.google.common.collect.Iterables; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.List; +import net.sourceforge.plantuml.SourceStringReader; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.xtend2.lib.StringConcatenation; +import org.eclipse.xtext.generator.AbstractGenerator; +import org.eclipse.xtext.generator.IFileSystemAccess2; +import org.eclipse.xtext.generator.IFileSystemAccessExtension3; +import org.eclipse.xtext.generator.IGeneratorContext; +import org.eclipse.xtext.xbase.lib.Conversions; +import org.eclipse.xtext.xbase.lib.Exceptions; +import org.eclipse.xtext.xbase.lib.Functions.Function1; +import org.eclipse.xtext.xbase.lib.InputOutput; +import org.eclipse.xtext.xbase.lib.IterableExtensions; +import org.xtext.unipampa.erdsl.erDsl.ERModel; +import org.xtext.unipampa.erdsl.erDsl.Relation; + +@SuppressWarnings("all") +public class OccurrenceDiagramGenerator extends AbstractGenerator { + private String currentRelationshipName = null; + + @Override + public void doGenerate(final Resource input, final IFileSystemAccess2 fsa, final IGeneratorContext context) { + EObject _get = input.getContents().get(0); + final ERModel modeloER = ((ERModel) _get); + final Function1 _function = (Relation i) -> { + String _occurrence = i.getOccurrence(); + return Boolean.valueOf((_occurrence != null)); + }; + Iterable _filter = IterableExtensions.filter(modeloER.getRelations(), _function); + for (final Relation r : _filter) { + { + try { + this.currentRelationshipName = r.getName().toString(); + Iterable _filter_1 = Iterables.filter(input.getContents(), ERModel.class); + for (final ERModel diagramModel : _filter_1) { + { + final String plantUML = this.plotToPlantUML(diagramModel).toString(); + if ((fsa instanceof IFileSystemAccessExtension3)) { + final ByteArrayOutputStream out = new ByteArrayOutputStream(); + new SourceStringReader(plantUML).generateImage(out); + String _lowerCase = r.getName().toLowerCase(); + String _plus = (_lowerCase + "_OccurrenceDiagram.png"); + byte[] _byteArray = out.toByteArray(); + ByteArrayInputStream _byteArrayInputStream = new ByteArrayInputStream(_byteArray); + ((IFileSystemAccessExtension3) fsa).generateFile(_plus, _byteArrayInputStream); + String _lowerCase_1 = r.getName().toLowerCase(); + String _plus_1 = (_lowerCase_1 + "_OccurrenceDiagramDesc_Gen.puml"); + fsa.generateFile(_plus_1, plantUML); + } else { + String _lowerCase_2 = r.getName().toLowerCase(); + String _plus_2 = (_lowerCase_2 + "_OccurrenceDiagramDesc_PartialGen.puml"); + fsa.generateFile(_plus_2, plantUML); + } + } + } + } catch (final Throwable _t) { + if (_t instanceof Exception) { + final Exception e = (Exception)_t; + InputOutput.println(((List)Conversions.doWrapArray(e.getStackTrace())).toString()); + } else { + throw Exceptions.sneakyThrow(_t); + } + } + this.currentRelationshipName = null; + } + } + } + + private CharSequence plotToPlantUML(final ERModel it) { + StringConcatenation _builder = new StringConcatenation(); + _builder.append("@startuml"); + _builder.newLine(); + _builder.append("\' - Esconde os (*letra*) dos objetos (E para entidade, C para classe, O para objetos, etc)"); + _builder.newLine(); + _builder.append("\' hide circle"); + _builder.newLine(); + _builder.append("\' - workaround para evitar problemas com os angulos do crows foot"); + _builder.newLine(); + _builder.append("\' skinparam linetype ortho"); + _builder.newLine(); + _builder.append("skinparam titleBorderRoundCorner 15"); + _builder.newLine(); + _builder.append("skinparam titleBorderThickness 1"); + _builder.newLine(); + _builder.append("\' skinparam titleBorderColor red"); + _builder.newLine(); + _builder.append("\' skinparam titleBackgroundColor CadetBlue"); + _builder.newLine(); + _builder.append("scale 2.0"); + _builder.newLine(); + _builder.append("\' skinparam monochrome true"); + _builder.newLine(); + _builder.append("header"); + _builder.newLine(); + _builder.append("Diagram generated by ERtext"); + _builder.newLine(); + _builder.append("endheader"); + _builder.newLine(); + _builder.append("right footer https://github.com/ProjetoDSL/ERDSL"); + _builder.newLine(); + _builder.append("title Occurrence Diagram\\n"); + _builder.append(this.currentRelationshipName); + _builder.newLineIfNotEmpty(); + { + final Function1 _function = (Relation i) -> { + String _occurrence = i.getOccurrence(); + return Boolean.valueOf((_occurrence != null)); + }; + Iterable _filter = IterableExtensions.filter(it.getRelations(), _function); + for(final Relation e : _filter) { + { + boolean _equalsIgnoreCase = e.getName().equalsIgnoreCase(this.currentRelationshipName); + if (_equalsIgnoreCase) { + CharSequence _plotToPlantUML = this.plotToPlantUML(e); + _builder.append(_plotToPlantUML); + _builder.newLineIfNotEmpty(); + } + } + } + } + _builder.append("@enduml"); + _builder.newLine(); + return _builder; + } + + private CharSequence plotToPlantUML(final Relation r) { + StringConcatenation _builder = new StringConcatenation(); + _builder.append("\' top to bottom direction"); + _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); + _builder.append(_initDefaultObjects); + _builder.newLineIfNotEmpty(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y3"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("A -- X"); + _builder.newLine(); + _builder.append("B -- Z"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { + _builder.append("package "); + String _string = r.getLeftEnding().getTarget().toString(); + _builder.append(_string); + String _cardinality = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object A"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object B"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _string_1 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_1); + String _cardinality_1 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_1); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object X"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object Y"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object Z"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("A -- X"); + _builder.newLine(); + _builder.append("B -- Z"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { + _builder.append("package "); + String _string_2 = r.getLeftEnding().getTarget().toString(); + _builder.append(_string_2); + String _cardinality_2 = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality_2); + _builder.append("{"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object A"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object B"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object C"); + _builder.newLine(); + _builder.append("}\t"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.newLine(); + _builder.append("package "); + String _string_3 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_3); + String _cardinality_3 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_3); + _builder.append(" {"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("object X"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object Y"); + _builder.newLine(); + _builder.append("}"); + _builder.newLine(); + _builder.newLine(); + _builder.append("A -- X"); + _builder.newLine(); + _builder.append("C -- Y"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { + CharSequence _initDefaultObjects_1 = this.initDefaultObjects(r); + _builder.append(_initDefaultObjects_1); + _builder.newLineIfNotEmpty(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_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_y2"); + _builder.newLine(); + _builder.append("x2_y2 -- y2"); + _builder.newLine(); + _builder.append("x3 -- x3_y3 "); + _builder.newLine(); + _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.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { + _builder.append("1,1 - 1,n"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { + _builder.append("1,n - 0,1"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { + _builder.append("1,n - 1,1"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { + _builder.append("0,1 - 0,n"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:1)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { + _builder.append("1,1 - 0,n"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:1)"))) { + _builder.append("0,n - 0,1"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:1)"))) { + _builder.append("0,n - 1,1"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { + CharSequence _initDefaultObjects_2 = this.initDefaultObjects(r); + _builder.append(_initDefaultObjects_2); + _builder.newLineIfNotEmpty(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_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("x1 -- x1_y3"); + _builder.newLine(); + _builder.append("x1_y3 -- y3"); + _builder.newLine(); + _builder.append("x2 -- x2_y1"); + _builder.newLine(); + _builder.append("x2_y1 -- y1"); + _builder.newLine(); + _builder.append("x2 -- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 -- y3"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { + CharSequence _initDefaultObjects_3 = this.initDefaultObjects(r); + _builder.append(_initDefaultObjects_3); + _builder.newLineIfNotEmpty(); + _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_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y2"); + _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_y1"); + _builder.newLine(); + _builder.append("x2_y1 -- y1"); + _builder.newLine(); + _builder.append("x2 -- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 -- y3"); + _builder.newLine(); + _builder.append("x3 -- x3_y2"); + _builder.newLine(); + _builder.append("x3_y2 -- y2"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(0:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(1:N)"))) { + CharSequence _initDefaultObjects_4 = this.initDefaultObjects(r); + _builder.append(_initDefaultObjects_4); + _builder.newLineIfNotEmpty(); + _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 x1_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x3_y2"); + _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("x1 -- x1_y2"); + _builder.newLine(); + _builder.append("x1_y2 --y2"); + _builder.newLine(); + _builder.append("x3 -- x3_y2"); + _builder.newLine(); + _builder.append("x3_y2 -- y2"); + _builder.newLine(); + } else { + if ((r.getLeftEnding().getCardinality().equalsIgnoreCase("(1:N)") && r.getRightEnding().getCardinality().equalsIgnoreCase("(0:N)"))) { + CharSequence _initDefaultObjects_5 = this.initDefaultObjects(r); + _builder.append(_initDefaultObjects_5); + _builder.newLineIfNotEmpty(); + _builder.append("package relationship {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y2"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x1_y3"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_y1"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("object x2_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_y2"); + _builder.newLine(); + _builder.append("x2_y2 -- y2"); + _builder.newLine(); + _builder.append("x1 -- x1_y3"); + _builder.newLine(); + _builder.append("x1_y3 -- y3"); + _builder.newLine(); + _builder.append("x2 -- x2_y1"); + _builder.newLine(); + _builder.append("x2_y1 -- y1"); + _builder.newLine(); + _builder.append("x2 -- x2_y3"); + _builder.newLine(); + _builder.append("x2_y3 -- y3"); + _builder.newLine(); + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + } + return _builder; + } + + private CharSequence initDefaultObjects(final Relation r) { + StringConcatenation _builder = new StringConcatenation(); + _builder.append("package "); + String _string = r.getLeftEnding().getTarget().toString(); + _builder.append(_string); + String _cardinality = r.getLeftEnding().getCardinality(); + _builder.append(_cardinality); + _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 _cardinality_1 = r.getRightEnding().getCardinality(); + _builder.append(_cardinality_1); + String _string_1 = r.getRightEnding().getTarget().toString(); + _builder.append(_string_1); + _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(); + return _builder; + } +} diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.java b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.java deleted file mode 100644 index 9bc3ca3..0000000 --- a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/OcurrenceDiagramGenerator.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.xtext.unipampa.erdsl.generator; - -import java.util.List; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.xtend2.lib.StringConcatenation; -import org.eclipse.xtext.generator.AbstractGenerator; -import org.eclipse.xtext.generator.IFileSystemAccess2; -import org.eclipse.xtext.generator.IGeneratorContext; -import org.eclipse.xtext.xbase.lib.Conversions; -import org.eclipse.xtext.xbase.lib.Exceptions; -import org.eclipse.xtext.xbase.lib.InputOutput; -import org.xtext.unipampa.erdsl.erDsl.ERModel; - -@SuppressWarnings("all") -public class OcurrenceDiagramGenerator extends AbstractGenerator { - @Override - public void doGenerate(final Resource input, final IFileSystemAccess2 fsa, final IGeneratorContext context) { - EObject _get = input.getContents().get(0); - final ERModel modeloER = ((ERModel) _get); - try { - String _lowerCase = modeloER.getDomain().getName().toLowerCase(); - String _plus = (_lowerCase + "_OcurrenceDiagram.sql"); - fsa.generateFile(_plus, this.ocurrence_CreateDiagram(modeloER)); - } catch (final Throwable _t) { - if (_t instanceof Exception) { - final Exception e = (Exception)_t; - InputOutput.println(((List)Conversions.doWrapArray(e.getStackTrace())).toString()); - } else { - throw Exceptions.sneakyThrow(_t); - } - } - } - - private CharSequence ocurrence_CreateDiagram(final ERModel modeloER) { - StringConcatenation _builder = new StringConcatenation(); - _builder.append("Test"); - _builder.newLine(); - return _builder; - } -} diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java index c9bf76c..1f35879 100644 --- a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java +++ b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/PlantUmlFileGenerator.java @@ -41,13 +41,10 @@ public void doGenerate(final Resource input, final IFileSystemAccess2 fsa, final byte[] _byteArray = out.toByteArray(); ByteArrayInputStream _byteArrayInputStream = new ByteArrayInputStream(_byteArray); ((IFileSystemAccessExtension3) fsa).generateFile(_plus, _byteArrayInputStream); + } else { String _lowerCase_1 = modeloER.getDomain().getName().toLowerCase(); - String _plus_1 = (_lowerCase_1 + "_DiagramDesc_Gen.puml"); + String _plus_1 = (_lowerCase_1 + "_DiagramDesc_PartialGen.puml"); fsa.generateFile(_plus_1, plantUML); - } else { - String _lowerCase_2 = modeloER.getDomain().getName().toLowerCase(); - String _plus_2 = (_lowerCase_2 + "_DiagramDesc_PartialGen.puml"); - fsa.generateFile(_plus_2, plantUML); } } } @@ -79,7 +76,7 @@ private CharSequence _plotToPlantUML(final ERModel it) { _builder.newLine(); _builder.append("\' skinparam titleBorderColor red"); _builder.newLine(); - _builder.append("scale 1.0"); + _builder.append("scale 1.5"); _builder.newLine(); _builder.append("\' skinparam monochrome true"); _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 9039188..c9c8095 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