diff options
| author | jeremie.tatibouet | 2015-04-28 13:56:58 +0000 |
|---|---|---|
| committer | Arnaud Cuccuru | 2015-04-30 11:47:46 +0000 |
| commit | bbdda04530c5901c986da88c550db65a146aede7 (patch) | |
| tree | f18967d0e63785d1b1e636f4cd01c6710e43cd09 /plugins/uml/alf/org.eclipse.papyrus.uml.alf/src | |
| parent | 03c212d7016556ba542f4e69024fc0228c85722e (diff) | |
| download | org.eclipse.papyrus-bbdda04530c5901c986da88c550db65a146aede7.tar.gz org.eclipse.papyrus-bbdda04530c5901c986da88c550db65a146aede7.tar.xz org.eclipse.papyrus-bbdda04530c5901c986da88c550db65a146aede7.zip | |
Class, Signal, Enumeration, Datatype and package follows automatically
the evolution of the semantic model.
ElementImport, Generalization, PackageImport impacts are also supported.
Change-Id: I0178e33f270d8c542d8a6df68cc11b153732d6f2
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
Reviewed-on: https://git.eclipse.org/r/46748
Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Reviewed-on: https://git.eclipse.org/r/46799
Tested-by: Hudson CI
Diffstat (limited to 'plugins/uml/alf/org.eclipse.papyrus.uml.alf/src')
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/RunTimeCaching.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/RunTimeCaching.java index e2c639c3800..4d4edaa6285 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/RunTimeCaching.java +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/RunTimeCaching.java @@ -34,7 +34,9 @@ public class RunTimeCaching { } public void add(SyntaxElementImpl element) { - this.registry.add(element); + if(element!=null){ + this.registry.add(element); + } } public void clear() { diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/formatting/AlfFormatter.xtend b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/formatting/AlfFormatter.xtend index c1bcb42cc0b..d426a747726 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/formatting/AlfFormatter.xtend +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/formatting/AlfFormatter.xtend @@ -218,8 +218,11 @@ class AlfFormatter extends AbstractDeclarativeFormatter { // Enumeration Definition c.setIndentationIncrement().after(enumerationDefinitionAccess.leftCurlyBracketKeyword_1); + c.setLinewrap().after(enumerationDefinitionAccess.leftCurlyBracketKeyword_1); + c.setLinewrap().before(enumerationDefinitionAccess.rightCurlyBracketKeyword_3); c.setIndentationDecrement().before(enumerationDefinitionAccess.rightCurlyBracketKeyword_3); c.setLinewrap().after(enumerationDefinitionAccess.rightCurlyBracketKeyword_3); + c.setLinewrap().after(enumerationDefinitionAccess.commaKeyword_2_1_0); c.setIndentationIncrement().after(enumerationDefinitionOrStubAccess.leftCurlyBracketKeyword_1_1_0); c.setIndentationDecrement().before(enumerationDefinitionOrStubAccess.rightCurlyBracketKeyword_1_1_2); |