Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2015-03-09 22:08:42 +0000
committerChristian W. Damus2015-03-09 22:11:21 +0000
commitc036a25da9a0080b7028e08bb47c862564d18619 (patch)
treefcbe072133f65e28516f64be534248bfde99939a /plugins/developer
parentd485df9ba4f2806f5586e991287b23825bf9c976 (diff)
downloadorg.eclipse.papyrus-c036a25da9a0080b7028e08bb47c862564d18619.tar.gz
org.eclipse.papyrus-c036a25da9a0080b7028e08bb47c862564d18619.tar.xz
org.eclipse.papyrus-c036a25da9a0080b7028e08bb47c862564d18619.zip
Bug 461717: [Assistants] Separate semantic and visual element types
https://bugs.eclipse.org/bugs/show_bug.cgi?id=461717 Add generation of semantic super-element-type reference in generated visual element types. Add an option in the wizard to suppress this semantic supertype reference. Add JUnit tests to verify the semantic supertype in the diagram-specific scenario and its absence in the generic element types scenario. Update the user documentation for the new behaviour and option in the wizard.
Diffstat (limited to 'plugins/developer')
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend6
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java2
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
index b53e22c112a..d9124801efd 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
@@ -38,7 +38,7 @@ class ElementTypeToAssistantRule {
}
private def createPossibleOwnersFilter(ElementTypeConfiguration type) {
- diagramSpecificElementTypes.fold(null) [ Filter filter, elementType |
+ baseElementTypes.fold(null) [ Filter filter, elementType |
if (elementType.canContainType(type))
filter || elementType.toFilter()
else
@@ -66,7 +66,7 @@ class ElementTypeToAssistantRule {
private def createPossibleSourcesFilter(ElementTypeConfiguration type) {
// Don't assist in creating connections from/to connections (relationships)
- diagramSpecificElementTypes.filter[!relationship].fold(null) [ Filter filter, elementType |
+ baseElementTypes.filter[!relationship].fold(null) [ Filter filter, elementType |
if (elementType.canSourceToType(type))
filter || elementType.toFilter
else
@@ -76,7 +76,7 @@ class ElementTypeToAssistantRule {
private def createPossibleTargetsFilter(ElementTypeConfiguration type) {
// Don't assist in creating connections from/to connections (relationships)
- diagramSpecificElementTypes.filter[!relationship].fold(null) [ Filter filter, elementType |
+ baseElementTypes.filter[!relationship].fold(null) [ Filter filter, elementType |
if (elementType.canTargetFromType(type))
filter || elementType.toFilter
else
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
index 85bde6fecca..84e8b3bbde5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
@@ -43,7 +43,7 @@ public class ElementTypesToAssistantsGenerator extends AbstractGenerator<Element
private static GeneratorModule createGeneratorModule(ElementTypeSetConfiguration elementTypeSet) {
Identifiers identifiers = new Identifiers();
- identifiers.setDiagramElementTypesSetConfiguration(elementTypeSet);
+ identifiers.setBaseElementTypesSetConfiguration(elementTypeSet);
return new GeneratorModule(identifiers);
}
}
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
index 93287f5a33d..dc39ffd8019 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
@@ -45,7 +45,7 @@ public class GMFGenToAssistantsGenerator extends AbstractGenerator<GenEditorGene
Identifiers identifiers = new Identifiers();
// TODO: Prompt the user for this
- identifiers.setDiagramElementTypesSet(editor.getPlugin().getID() + ".elementTypeSet");
+ identifiers.setBaseElementTypesSet(editor.getPlugin().getID() + ".elementTypeSet");
return new GeneratorModule(identifiers);
}
}

Back to the top