Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2008-05-07 09:55:59 -0400
committeratikhomirov2008-05-07 09:55:59 -0400
commitfd553654ad4617e337659e36e07f58cf4107a83e (patch)
tree62dfbe60f663481d274b4e247a4075a96819e715
parent833e13abbbe78f8de342559aea99988b1058e726 (diff)
downloadorg.eclipse.gmf-tooling-fd553654ad4617e337659e36e07f58cf4107a83e.tar.gz
org.eclipse.gmf-tooling-fd553654ad4617e337659e36e07f58cf4107a83e.tar.xz
org.eclipse.gmf-tooling-fd553654ad4617e337659e36e07f58cf4107a83e.zip
[228913] updated ValueExpression use in GMFGen to better accomodate codegen needs (items 1,2,3)
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore50
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel9
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen_2007.ecore2011
-rw-r--r--plugins/org.eclipse.gmf.codegen/plugin.xml10
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java139
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenAuditRule.java10
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderBase.java10
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderContainer.java10
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenFeatureValueSpec.java38
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenJavaExpressionProvider.java6
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenLinkConstraints.java22
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenMetricRule.java10
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/TypeModelFacet.java11
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/ValueExpression.java51
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java59
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenAuditRuleImpl.java43
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderBaseImpl.java14
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderContainerImpl.java26
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenFeatureValueSpecImpl.java99
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenLinkConstraintsImpl.java80
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenMetricRuleImpl.java40
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java40
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ValueExpressionImpl.java111
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java1
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates-dynmodel/Facility.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates-dynmodel/MetaModel.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/MetaModel.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt6
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/CompartmentViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/FloatingLabelViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelNodeViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LinkViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/NodeViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreateShortcutAction.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/LoadResourceAction.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt16
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext2
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt2
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt2
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/i18n.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ContributionItemProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.ext32
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt70
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementTypes.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt2
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt6
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt2
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt6
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.ext2
194 files changed, 2669 insertions, 695 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
index f31592940..7257fda7e 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
@@ -2,7 +2,7 @@
<ecore:EPackage xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="gmfgen"
- nsURI="http://www.eclipse.org/gmf/2006/GenModel" nsPrefix="gmfgen">
+ nsURI="http://www.eclipse.org/gmf/2008/GenModel" nsPrefix="gmfgen">
<eAnnotations source="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap">
<details key="constraints" value="http://www.eclipse.org/gmf/2005/constraints"/>
<details key="meta" value="http://www.eclipse.org/gmf/2005/constraints/meta"/>
@@ -955,8 +955,7 @@
<details key="description" value="'Child Meta Feature' must reference 'Meta Class' or its sub-classes"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="modelElementSelector" eType="#//GenConstraint"
- containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelElementSelector" eType="#//GenConstraint">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Selection criterion for domain model elements associated with this type model facet"/>
</eAnnotations>
@@ -1182,18 +1181,15 @@
<details key="def" value="body"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" lowerBound="1"
- eType="#//GenLanguage" defaultValueLiteral="ocl">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Specifies the language in which the expression is stated"/>
- </eAnnotations>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="langName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
changeable="false" volatile="true" transient="true" derived="true">
<eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
<details key="def" value="lang"/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="provider" lowerBound="1"
+ eType="#//GenExpressionProviderBase" changeable="false" resolveProxies="false"
+ eOpposite="#//GenExpressionProviderBase/expressions"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenConstraint" eSuperTypes="#//ValueExpression">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1313,17 +1309,16 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="creatingInitializer" eType="#//GenReferenceNewElementSpec"
changeable="false" resolveProxies="false" eOpposite="#//GenReferenceNewElementSpec/newElementInitializers"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GenFeatureValueSpec" eSuperTypes="#//ValueExpression #//GenFeatureInitializer">
+ <eClassifiers xsi:type="ecore:EClass" name="GenFeatureValueSpec" eSuperTypes="#//GenFeatureInitializer">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Value specification associated with a specific feature"/>
</eAnnotations>
- <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
- <details key="def" value="ValueSpec"/>
- </eAnnotations>
- <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
- <details key="def" value="type"/>
- <details key="ocl" value="feature.ecoreFeature"/>
- </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//ValueExpression">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="featureSeqInitializer.elementClass"/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenReferenceNewElementSpec" eSuperTypes="#//GenFeatureInitializer">
<eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
@@ -1389,8 +1384,7 @@
<details key="documentation" value="References the owning link of this constraints"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEnd" eType="#//GenConstraint"
- containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEnd" eType="#//GenConstraint">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Restriction enforced by the the source end, may reference variables 'oppositeEnd' pointing to targetEnd and 'link' denoting the link domainmetaElement instance if available."/>
</eAnnotations>
@@ -1404,8 +1398,7 @@
<details key="type.ocl" value="getTargetEndContextClass().ecoreClass"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="targetEnd" eType="#//GenConstraint"
- containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="targetEnd" eType="#//GenConstraint">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Restriction enforced by the the target end, may reference variables 'oppositeEnd' pointing to sourceEnd and 'link' denoting the link domainmetaElement instance if available."/>
</eAnnotations>
@@ -1492,8 +1485,7 @@
<details key="description" value="Audit rule with the same ID already exists"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//GenConstraint"
- containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//GenConstraint">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target"/>
</eAnnotations>
@@ -1624,8 +1616,7 @@
<details key="description" value="Metric rule with the same 'key' already exists"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//ValueExpression"
- containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//ValueExpression">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives"/>
</eAnnotations>
@@ -1716,9 +1707,6 @@
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenExpressionProviderContainer">
- <eOperations name="getProvider" eType="#//GenExpressionProviderBase">
- <eParameters name="expression" lowerBound="1" eType="#//ValueExpression"/>
- </eOperations>
<eOperations name="getAbstractExpressionQualifiedClassName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionsPackageName"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -1731,8 +1719,8 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenExpressionProviderBase" abstract="true">
<eOperations name="getLanguage" lowerBound="1" eType="#//GenLanguage"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" upperBound="-1"
- eType="#//ValueExpression"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" lowerBound="1"
+ upperBound="-1" eType="#//ValueExpression" containment="true" eOpposite="#//ValueExpression/provider"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
eType="#//GenExpressionProviderContainer" changeable="false" resolveProxies="false"
eOpposite="#//GenExpressionProviderContainer/providers"/>
@@ -1747,7 +1735,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="injectExpressionBody" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="false">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="When 'true', body of associated ValueExpression would get injected into Java code as-is, thus allowing to provide method implementations right within the model. Note, if body is empty, default implementation would be generated instead."/>
+ <details key="documentaion" value="When 'true', body of associated ValueExpression would get injected into Java code as-is, thus allowing to provide method implementations right within the model. Note, if body is empty, default implementation would be generated instead."/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel b/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
index 7a8b16745..8c345e5c9 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
@@ -618,8 +618,8 @@
</genClasses>
<genClasses ecoreClass="gmfgen.ecore#//ValueExpression" labelFeature="#//gmfgen/ValueExpression/body">
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute gmfgen.ecore#//ValueExpression/body"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgen.ecore#//ValueExpression/language"/>
<genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute gmfgen.ecore#//ValueExpression/langName"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//ValueExpression/provider"/>
<genOperations ecoreOperation="gmfgen.ecore#//ValueExpression/getBodyString"/>
</genClasses>
<genClasses ecoreClass="gmfgen.ecore#//GenConstraint" labelFeature="#//gmfgen/ValueExpression/body"/>
@@ -672,7 +672,9 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgen.ecore#//GenFeatureSeqInitializer/elementClass"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//GenFeatureSeqInitializer/creatingInitializer"/>
</genClasses>
- <genClasses ecoreClass="gmfgen.ecore#//GenFeatureValueSpec" labelFeature="#//gmfgen/ValueExpression/body"/>
+ <genClasses ecoreClass="gmfgen.ecore#//GenFeatureValueSpec">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgen.ecore#//GenFeatureValueSpec/value"/>
+ </genClasses>
<genClasses ecoreClass="gmfgen.ecore#//GenReferenceNewElementSpec">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgen.ecore#//GenReferenceNewElementSpec/newElementInitializers"/>
</genClasses>
@@ -772,9 +774,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgen.ecore#//GenExpressionProviderContainer/abstractExpressionClassName"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgen.ecore#//GenExpressionProviderContainer/providers"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//GenExpressionProviderContainer/editorGen"/>
- <genOperations ecoreOperation="gmfgen.ecore#//GenExpressionProviderContainer/getProvider">
- <genParameters ecoreParameter="gmfgen.ecore#//GenExpressionProviderContainer/getProvider/expression"/>
- </genOperations>
<genOperations ecoreOperation="gmfgen.ecore#//GenExpressionProviderContainer/getAbstractExpressionQualifiedClassName"/>
</genClasses>
<genClasses ecoreClass="gmfgen.ecore#//GenExpressionProviderBase">
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen_2007.ecore b/plugins/org.eclipse.gmf.codegen/models/gmfgen_2007.ecore
new file mode 100644
index 000000000..f31592940
--- /dev/null
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen_2007.ecore
@@ -0,0 +1,2011 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="gmfgen"
+ nsURI="http://www.eclipse.org/gmf/2006/GenModel" nsPrefix="gmfgen">
+ <eAnnotations source="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap">
+ <details key="constraints" value="http://www.eclipse.org/gmf/2005/constraints"/>
+ <details key="meta" value="http://www.eclipse.org/gmf/2005/constraints/meta"/>
+ <details key="deprecated" value="http://www.eclipse.org/gmf/2006/deprecated"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="import" value="http://www.eclipse.org/gmf/runtime/1.0.0/notation"/>
+ </eAnnotations>
+ <eClassifiers xsi:type="ecore:EClass" name="GenEditorGenerator">
+ <eOperations name="getAllDomainGenPackages" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenPackage">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns all genpackages from domain genmodel"/>
+ </eAnnotations>
+ <eParameters name="withUsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eOperations>
+ <eOperations name="requiresParser" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns true if parser for the specified method is used by diagram editor"/>
+ </eAnnotations>
+ <eParameters name="method" eType="#//LabelTextAccessMethod"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="audits" eType="#//GenAuditRoot"
+ containment="true" eOpposite="#//GenAuditRoot/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metrics" eType="#//GenMetricContainer"
+ containment="true" eOpposite="#//GenMetricContainer/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+ eType="#//GenDiagram" containment="true" eOpposite="#//GenDiagram/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="plugin" lowerBound="1"
+ eType="#//GenPlugin" containment="true" eOpposite="#//GenPlugin/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editor" lowerBound="1"
+ eType="#//GenEditorView" containment="true" eOpposite="#//GenEditorView/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="navigator" eType="#//GenNavigator"
+ containment="true" eOpposite="#//GenNavigator/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagramUpdater" lowerBound="1"
+ eType="#//GenDiagramUpdater" containment="true" eOpposite="#//GenDiagramUpdater/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="propertySheet" eType="#//GenPropertySheet"
+ containment="true" eOpposite="#//GenPropertySheet/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="application" eType="#//GenApplication"
+ containment="true" eOpposite="#//GenApplication/editorGen">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="If application is defined within the model then generator should target RCP"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="domainGenModel" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenModel">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This is primary EMF genmodel for user's domain model"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageNamePrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Derived from genModel.genPackage[0].getBasePackage() by default"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelID" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sameFileForDiagramAndModel"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specified whether editor should create separate file for domain elements if diagram file references no domain model"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramFileExtension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Distinct even when sameFileForDiagramAndModel is true. On init diagram, we just copy domain model element to new file with that extension. I won't try to set this equal to domainFileExtension"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainFileExtension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="By default, genModel.genPackage[0].getPrefix().toLowerCase(), as in emf/templates/editor/pluign.xmljet"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dynamicTemplates" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="templateDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="copyrightText" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expressionProviders" eType="#//GenExpressionProviderContainer"
+ containment="true" eOpposite="#//GenExpressionProviderContainer/editorGen"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelAccess" eType="#//DynamicModelAccess"
+ containment="true" eOpposite="#//DynamicModelAccess/editorGen">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="If present, specifies dynamic access to domain model(s), without using generated Java code"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDiagram" eSuperTypes="#//GenContainerBase #//PackageNames #//ProviderClassNames #//LinkConstraints #//EditPartCandies #//EditorCandies #//Shortcuts #//BatchValidation #//MeasurementUnit">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="diagramRunTimeClass.ecoreClass.eAllSuperTypes->including(diagramRunTimeClass.ecoreClass)->one(ePackage.name = 'notation' and name = 'Diagram')"/>
+ <details key="description" value="'Diagram Runtime Class' must be a notation::Diagram or sub-class"/>
+ </eAnnotations>
+ <eOperations name="getAllNodes" upperBound="-1" eType="#//GenNode"/>
+ <eOperations name="getAllChildContainers" upperBound="-1" eType="#//GenChildContainer"/>
+ <eOperations name="getAllContainers" upperBound="-1" eType="#//GenContainerBase"/>
+ <eOperations name="getElementInitializersClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets the name of the class to hold the initializer methods for domain elements"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getElementInitializersPackageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets the name of the package to hold the element initializers class"/>
+ </eAnnotations>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" eType="#//GenEditorGenerator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/diagram"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="domainDiagramElement" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="childNodes" upperBound="-1"
+ eType="#//GenChildNode" containment="true" eOpposite="#//GenChildNode/diagram"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="topLevelNodes" upperBound="-1"
+ eType="#//GenTopLevelNode" containment="true" eOpposite="#//GenTopLevelNode/diagram"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
+ eType="#//GenLink" containment="true" eOpposite="#//GenLink/diagram"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
+ eType="#//GenCompartment" containment="true" eOpposite="#//GenCompartment/diagram"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="palette" eType="#//Palette"
+ containment="true" eOpposite="#//Palette/diagram"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="synchronized" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="preferences" eType="#//GenDiagramPreferences"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="preferencePages" upperBound="-1"
+ eType="#//GenPreferencePage" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenEditorView">
+ <eOperations name="getActionBarContributorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" eType="#//GenEditorGenerator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/editor"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="actionBarContributorClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPathX" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="eclipseEditor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenPreferencePage" abstract="true">
+ <eOperations name="getDiagram" eType="#//GenDiagram"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//GenPreferencePage" containment="true" eOpposite="#//GenPreferencePage/parent"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//GenPreferencePage"
+ changeable="false" resolveProxies="false" eOpposite="#//GenPreferencePage/children"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenCustomPreferencePage" eSuperTypes="#//GenPreferencePage">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedClassName" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenStandardPreferencePage" eSuperTypes="#//GenPreferencePage">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//StandardPreferencePages"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="StandardPreferencePages">
+ <eLiterals name="General"/>
+ <eLiterals name="Appearance" value="1"/>
+ <eLiterals name="Connections" value="2"/>
+ <eLiterals name="Printing" value="3"/>
+ <eLiterals name="RulersAndGrid" value="4"/>
+ <eLiterals name="Pathmaps" value="5"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDiagramPreferences">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" eType="#//Routing"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="defaultFont" eType="#//GenFont"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fontColor" eType="#//GenColor"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fillColor" eType="#//GenColor"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="lineColor" eType="#//GenColor"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="noteFillColor" eType="#//GenColor"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="noteLineColor" eType="#//GenColor"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="showConnectionHandles"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="showPopupBars" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="promptOnDelFromModel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="promptOnDelFromDiagram"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableAnimatedLayout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableAnimatedZoom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableAntiAlias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="showGrid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="showRulers" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="snapToGrid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="rulerUnits" eType="#//RulerUnits"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="gridSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="RulerUnits">
+ <eLiterals name="INCHES"/>
+ <eLiterals name="CENTIMETERS" value="1"/>
+ <eLiterals name="PIXELS" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="Routing">
+ <eLiterals name="MANUAL"/>
+ <eLiterals name="RECTILINEAR" value="1"/>
+ <eLiterals name="TREE" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenFont" abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="GenStandardFont" eSuperTypes="#//GenFont">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="#//JFaceFont"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="JFaceFont">
+ <eLiterals name="Default"/>
+ <eLiterals name="Text" value="1"/>
+ <eLiterals name="Banner" value="2"/>
+ <eLiterals name="Dialog" value="3"/>
+ <eLiterals name="Header" value="4"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenCustomFont" eSuperTypes="#//GenFont">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//FontStyle"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="FontStyle">
+ <eLiterals name="NORMAL"/>
+ <eLiterals name="BOLD" value="1"/>
+ <eLiterals name="ITALIC" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenColor" abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="GenRGBColor" eSuperTypes="#//GenColor">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="red" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="green" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenConstantColor" eSuperTypes="#//GenColor">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="#//DiagramColors"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="DiagramColors">
+ <eLiterals name="buttonLightest"/>
+ <eLiterals name="button" value="1"/>
+ <eLiterals name="buttonDarker" value="2"/>
+ <eLiterals name="buttonDarkest" value="3"/>
+ <eLiterals name="listBackground" value="4"/>
+ <eLiterals name="listForeground" value="5"/>
+ <eLiterals name="menuBackground" value="6"/>
+ <eLiterals name="menuForeground" value="7"/>
+ <eLiterals name="menuBackgroundSelected" value="8"/>
+ <eLiterals name="menuForegroundSelected" value="9"/>
+ <eLiterals name="titleBackground" value="10"/>
+ <eLiterals name="titleGradient" value="11"/>
+ <eLiterals name="titleForeground" value="12"/>
+ <eLiterals name="titleInactiveForeground" value="13"/>
+ <eLiterals name="titleInactiveBackground" value="14"/>
+ <eLiterals name="titleInactiveGradient" value="15"/>
+ <eLiterals name="tooltipForeground" value="16"/>
+ <eLiterals name="tooltipBackground" value="17"/>
+ <eLiterals name="white" value="18"/>
+ <eLiterals name="lightGray" value="19"/>
+ <eLiterals name="gray" value="20"/>
+ <eLiterals name="darkGray" value="21"/>
+ <eLiterals name="black" value="22"/>
+ <eLiterals name="red" value="23"/>
+ <eLiterals name="orange" value="24"/>
+ <eLiterals name="yellow" value="25"/>
+ <eLiterals name="green" value="26"/>
+ <eLiterals name="lightGreen" value="27"/>
+ <eLiterals name="darkGreen" value="28"/>
+ <eLiterals name="cyan" value="29"/>
+ <eLiterals name="lightBlue" value="30"/>
+ <eLiterals name="blue" value="31"/>
+ <eLiterals name="darkBlue" value="32"/>
+ <eLiterals name="diagramGreen" value="33"/>
+ <eLiterals name="diagramLightRed" value="34"/>
+ <eLiterals name="diagramRed" value="35"/>
+ <eLiterals name="diagramLightBlue" value="36"/>
+ <eLiterals name="diagramBlue" value="37"/>
+ <eLiterals name="diagramLightGray" value="38"/>
+ <eLiterals name="diagramGray" value="39"/>
+ <eLiterals name="diagramDarkGray" value="40"/>
+ <eLiterals name="diagramLightYellow" value="41"/>
+ <eLiterals name="diagramDarkYellow" value="42"/>
+ <eLiterals name="diagramLightGoldYellow" value="43"/>
+ <eLiterals name="diagramBurgundyRed" value="44"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BatchValidation" abstract="true" interface="true">
+ <eOperations name="getValidationProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getValidationDiagnosticMarkerType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets diagnostic marker type ID local to the editor plugin. The editor pluginID should be used to fully-qualify this ID."/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getMarkerNavigationProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getMetricProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getMetricViewID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getValidationDecoratorProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="markerNavigationProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="markerNavigationProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationEnabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="If enabled, ValidationAction is contributed by the editor plugin"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="metricProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="metricProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationDecoratorProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationDecorators" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="validationDecoratorProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="liveValidationUIFeedback"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ProviderClassNames" abstract="true"
+ interface="true">
+ <eOperations name="getElementTypesQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getNotationViewProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getEditPartProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getModelingAssistantProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getIconProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getParserProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getContributionItemProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypesClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="notationViewProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="notationViewProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelingAssistantProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelingAssistantProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconProviderPriority" eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parserProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parserProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionItemProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="ProviderPriority">
+ <eLiterals name="Lowest"/>
+ <eLiterals name="Low" value="1"/>
+ <eLiterals name="Medium" value="2"/>
+ <eLiterals name="High" value="3"/>
+ <eLiterals name="Highest" value="4"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Shortcuts" abstract="true" interface="true">
+ <eOperations name="getShortcutsDecoratorProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getCreateShortcutActionQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getCreateShortcutDecorationsCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getShortcutPropertyTesterQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="generateCreateShortcutAction" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="generateShortcutIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortcutsDecoratorProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortcutsDecoratorProviderPriority"
+ eType="#//ProviderPriority"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createShortcutActionClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createShortcutDecorationsCommandClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortcutPropertyTesterClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="containsShortcutsTo" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Set of domain meta-model file extensions. Elements of the corresponding models could be added as a shortcut on this diagram."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortcutsProvidedFor" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Set of domain meta-model names. Elements of this diagram domain model could be added as a shortcuts to the diagrams of the specified domains."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PackageNames" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editCommandsPackageName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelpersPackageName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartsPackageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPoliciesPackageName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferencesPackageName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="providersPackageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parsersPackageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="notationViewFactoriesPackageName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="LinkConstraints" abstract="true" interface="true">
+ <eOperations name="hasLinkCreationConstraints" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Indicates whether this diagram contains link creation constraints or not"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2006/deprecated">
+ <details key="documentation" value="LinkCreationConstants should be generated if diagram has any links"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getLinkCreationConstraintsClassName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets the name of the constraints holder class"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getLinkCreationConstraintsQualifiedClassName" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets the qualified name of the constraints holder class"/>
+ </eAnnotations>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EditorCandies" abstract="true" interface="true">
+ <eOperations name="getCreationWizardQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getCreationWizardPageQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDiagramEditorUtilQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDocumentProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getInitDiagramFileActionQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getNewDiagramFileWizardQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDiagramContentInitializerQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getMatchingStrategyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getVisualIDRegistryQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getElementChooserQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLoadResourceActionQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="generateInitDiagramAction" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationWizardClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationWizardPageClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationWizardIconPath"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationWizardIconPathX"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationWizardCategoryID"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramEditorUtilClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="initDiagramFileActionClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="newDiagramFileWizardClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramContentInitializerClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="matchingStrategyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visualIDRegistryClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementChooserClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadResourceActionClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editingDomainID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EditPartCandies" abstract="true" interface="true">
+ <eOperations name="getReorientConnectionViewCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getBaseEditHelperQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getEditPartFactoryQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getBaseExternalNodeLabelEditPartQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getBaseItemSemanticEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getBaseGraphicalNodeEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getTextSelectionEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getTextNonResizableEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="reorientConnectionViewCommandClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseEditHelperClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartFactoryClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseExternalNodeLabelEditPartClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseItemSemanticEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseGraphicalNodeEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="textSelectionEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="textNonResizableEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MeasurementUnit" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="units" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="Pixel"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDiagramUpdater">
+ <eOperations name="getDiagramUpdaterQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getNodeDescriptorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLinkDescriptorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getUpdateCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" eType="#//GenEditorGenerator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/diagramUpdater"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramUpdaterClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodeDescriptorClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkDescriptorClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateCommandClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateCommandID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenPlugin">
+ <eOperations name="getAllRequiredPlugins" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Computed additional dependencies (in form of plug-in identifiers), including those explicitly specified by user and those derived from referenced genmodels"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getActivatorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" eType="#//GenEditorGenerator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/plugin"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="Sample Plugin Provider, Inc"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="1.0.0.qualifier"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="printingEnabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredPlugins" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="activatorClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DynamicModelAccess">
+ <eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" eType="#//GenEditorGenerator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/modelAccess"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="MetaModelFacility"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenCommonBase" abstract="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="One that combines attributes that are essential for diagram elements"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="styles->forAll(style|style.ecoreClass.eAllSuperTypes->including(style.ecoreClass)->one(ePackage.name = 'notation' and name = 'Style'))"/>
+ <details key="description" value="Each style must be a notation::Style or sub-class"/>
+ </eAnnotations>
+ <eOperations name="getEditPartQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getItemSemanticEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getNotationViewFactoryQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDiagram" eType="#//GenDiagram"/>
+ <eOperations name="getClassNamePrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getClassNameSuffux" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getUniqueIdentifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This unique string identifier could be used to construct unique identifiers in generated java code"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getLayoutType" eType="#//ViewmapLayoutType"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagramRunTimeClass" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visualID" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="way to decide which editpart to use for specific diagram element. Maps to attribute in DRT."/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="visualID >= 0"/>
+ <details key="description" value="Visual ID must be a non-negative integer"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" eType="#//ElementType"
+ containment="true" eOpposite="#//ElementType/diagramElement"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPartClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="itemSemanticEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="notationViewFactoryClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="viewmap" lowerBound="1"
+ eType="#//Viewmap" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="styles" upperBound="-1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="behaviour" upperBound="-1"
+ eType="#//Behaviour" containment="true" eOpposite="#//Behaviour/subject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sansDomain" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ changeable="false" volatile="true" transient="true" derived="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Indicates this element has no associated domain model. IOW, pure design element."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Behaviour" abstract="true" interface="true">
+ <eOperations name="getEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subject" eType="#//GenCommonBase"
+ changeable="false" resolveProxies="false" eOpposite="#//GenCommonBase/behaviour"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CustomBehaviour" eSuperTypes="#//Behaviour">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Custom user behaviour"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Key used to register edit policy in host edit part"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPolicyQualifiedClassName"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SharedBehaviour" eSuperTypes="#//Behaviour">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="delegate" lowerBound="1"
+ eType="#//Behaviour"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OpenDiagramBehaviour" eSuperTypes="#//Behaviour">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPolicyClassName" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramKind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="openAsEclipseEditor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenContainerBase" abstract="true" interface="true"
+ eSuperTypes="#//GenCommonBase">
+ <eOperations name="getAssistantNodes" upperBound="-1" eType="#//GenNode">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns child nodes that may be created in this container"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="needsCanonicalEditPolicy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="getCanonicalEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="containedNodes" upperBound="-1"
+ eType="#//GenNode" changeable="false" volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="canonicalEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenChildContainer" abstract="true" eSuperTypes="#//GenContainerBase">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Base class for all ChildNode containers"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="childNodes" upperBound="-1"
+ eType="#//GenChildNode" eOpposite="#//GenChildNode/containers"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNode" abstract="true" eSuperTypes="#//GenChildContainer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="EClass mapped to Node"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="diagramRunTimeClass.ecoreClass.eAllSuperTypes->including(diagramRunTimeClass.ecoreClass)->one(ePackage.name = 'notation' and name = 'Node')"/>
+ <details key="description" value="Node 'Diagram Runtime Class' must be a notation::Node or sub-class"/>
+ </eAnnotations>
+ <eOperations name="getDomainMetaClass" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Delegates to modelFacet"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getGraphicalNodeEditPolicyQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="valid only when there are compartments"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getCreateCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelFacet" eType="#//TypeModelFacet"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="labels" upperBound="-1"
+ eType="#//GenNodeLabel" containment="true" eOpposite="#//GenNodeLabel/node"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
+ eType="#//GenCompartment" eOpposite="#//GenCompartment/node"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="primaryDragEditPolicyQualifiedClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Custom primary drag edit policy"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="graphicalNodeEditPolicyClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createCommandClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="reorientedIncomingLinks"
+ upperBound="-1" eType="#//GenLink" changeable="false" volatile="true" transient="true"
+ derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenTopLevelNode" eSuperTypes="#//GenNode">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not modelFacet.containmentMetaFeature.oclIsUndefined() implies modelFacet.containmentMetaFeature.genClass.ecoreClass.isSuperTypeOf(diagram.domainDiagramElement.ecoreClass)"/>
+ <details key="description" value="Top level node 'Containment Feature' must be available in the diagram 'Domain Element' or its super-class"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+ eType="#//GenDiagram" changeable="false" resolveProxies="false" eOpposite="#//GenDiagram/topLevelNodes"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenChildNode" eSuperTypes="#//GenNode">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not modelFacet.oclIsUndefined() implies not modelFacet.containmentMetaFeature.oclIsUndefined()"/>
+ <details key="description" value="Child node must specify 'Containment Meta Feature'"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+ eType="#//GenDiagram" changeable="false" resolveProxies="false" eOpposite="#//GenDiagram/childNodes"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="containers" upperBound="-1"
+ eType="#//GenChildContainer" changeable="false" eOpposite="#//GenChildContainer/childNodes">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="let cmps:OrderedSet(GenChildContainer)=containers->select(oclIsKindOf(GenCompartment)) in cmps->exists(oclAsType(GenCompartment).listLayout) implies not cmps->exists(not oclAsType(GenCompartment).listLayout)"/>
+ <details key="description" value="Node is referenced from multiple containers with different 'List Layout' value"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenChildSideAffixedNode" eSuperTypes="#//GenChildNode">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferredSideName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="NONE"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenChildLabelNode" eSuperTypes="#//GenChildNode">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Child node represented by label; typically hosted by list compartment"/>
+ </eAnnotations>
+ <eOperations name="getLabelMetaFeatures" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns structural features that provide label content"/>
+ </eAnnotations>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelReadOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelElementIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="labelModelFacet" eType="#//LabelModelFacet"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="If model facet is not specified then custom parser should be provided for the label"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenCompartment" eSuperTypes="#//GenChildContainer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Child container within node. Compartment, iow."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="canCollapse" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="hideIfEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="needsTitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+ eType="#//GenDiagram" changeable="false" resolveProxies="false" eOpposite="#//GenDiagram/compartments"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="node" lowerBound="1" eType="#//GenNode"
+ eOpposite="#//GenNode/compartments"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="listLayout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenLink" eSuperTypes="#//GenCommonBase">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="diagramRunTimeClass.ecoreClass.eAllSuperTypes->including(diagramRunTimeClass.ecoreClass)->one(ePackage.name = 'notation' and name = 'Edge')"/>
+ <details key="description" value="Link 'Diagram Runtime Class' must be a notation::Edge or sub-class"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="outgoingCreationAllowed or incomingCreationAllowed"/>
+ <details key="description" value="Either outgoingCreationAllowed or incomingCreationAllowed property should be true"/>
+ </eAnnotations>
+ <eOperations name="getAssistantSources" upperBound="-1" eType="#//GenCommonBase">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns link sources in this genmodel"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getAssistantTargets" upperBound="-1" eType="#//GenCommonBase">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns link targets in this genmodel"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getCreateCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getReorientCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+ eType="#//GenDiagram" changeable="false" resolveProxies="false" eOpposite="#//GenDiagram/links"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelFacet" eType="#//LinkModelFacet"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="labels" upperBound="-1"
+ eType="#//GenLinkLabel" containment="true" eOpposite="#//GenLinkLabel/link"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="outgoingCreationAllowed"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Support link creation from source to target"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="incomingCreationAllowed"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Support link creation from target to source"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewDirectionAlignedWithModel"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="View (Edge) will always be directed from model source to model target"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="creationConstraints" eType="#//GenLinkConstraints"
+ containment="true" eOpposite="#//GenLinkConstraints/link">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specifies additional restrictions on link creation"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createCommandClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="reorientCommandClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="treeBranch" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenLabel" abstract="true" eSuperTypes="#//GenCommonBase">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Label on diagram"/>
+ </eAnnotations>
+ <eOperations name="getMetaFeatures" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns structural features that provide label content"/>
+ </eAnnotations>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelFacet" eType="#//LabelModelFacet"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="If model facet is not specified then custom parser should be provided for the label"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNodeLabel" eSuperTypes="#//GenLabel">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Label within node"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="getMetaFeatures()->forAll(f|f.ecoreFeature.eContainingClass.isSuperTypeOf(node.getDomainMetaClass().ecoreClass))"/>
+ <details key="description" value="Node label meta features must be owned by the node 'Meta Class' or its super-classes"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="node" lowerBound="1" eType="#//GenNode"
+ changeable="false" resolveProxies="false" eOpposite="#//GenNode/labels"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenExternalNodeLabel" eSuperTypes="#//GenNodeLabel">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Label attached to node"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenLinkLabel" eSuperTypes="#//GenLabel">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Label attached to link"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="modelFacet.oclIsTypeOf(FeatureLabelModelFacet)=true implies link.modelFacet.oclIsTypeOf(TypeLinkModelFacet)"/>
+ <details key="description" value="Feature based link labels can only be used on link with class (TypeLinkModelFacet)"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="let tl: TypeLinkModelFacet = link.modelFacet.oclAsType(TypeLinkModelFacet) in not tl.oclIsUndefined() implies self.getMetaFeatures()->forAll(f|f.ecoreFeature.eContainingClass.isSuperTypeOf(tl.metaClass.ecoreClass))"/>
+ <details key="description" value="Link label meta features must be owned by the node 'Meta Class' or its super-classes"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="link" lowerBound="1" eType="#//GenLink"
+ eOpposite="#//GenLink/labels"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="#//LinkLabelAlignment"
+ defaultValueLiteral="MIDDLE"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="LinkLabelAlignment">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Constants from {@link org.eclipse.draw2d.ConnectionLocator}"/>
+ </eAnnotations>
+ <eLiterals name="MIDDLE" value="4"/>
+ <eLiterals name="TARGET" value="3"/>
+ <eLiterals name="SOURCE" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ElementType" abstract="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Base element type"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagramElement" lowerBound="1"
+ eType="#//GenCommonBase" eOpposite="#//GenCommonBase/elementType"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uniqueIdentifier" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="When there's palette, defaults to title of first tool that uses element with this type"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="definedExternally" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MetamodelType" eSuperTypes="#//ElementType">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Element type based on ecore type"/>
+ </eAnnotations>
+ <eOperations name="getEditHelperQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getMetaClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SpecializationType" eSuperTypes="#//ElementType">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specialization of metamodel type"/>
+ </eAnnotations>
+ <eOperations name="getMetamodelClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eOperations name="getEditHelperAdviceQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metamodelType" eType="#//MetamodelType"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="NotationType" eSuperTypes="#//ElementType">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Pure design element"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ModelFacet" abstract="true" interface="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Marker interface for the particular model facets"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="LinkModelFacet" abstract="true" interface="true"
+ eSuperTypes="#//ModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of links"/>
+ </eAnnotations>
+ <eOperations name="getSourceType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eOperations name="getTargetType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eOperations name="getAssistantSourceTypes" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eOperations name="getAssistantTargetTypes" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="LabelModelFacet" abstract="true" interface="true"
+ eSuperTypes="#//ModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of labels"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TypeModelFacet" eSuperTypes="#//ModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of an EClass"/>
+ </eAnnotations>
+ <eOperations name="isPhantomElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metaClass" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="containmentMetaFeature"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="let r: ecore::EReference=containmentMetaFeature.ecoreFeature.oclAsType(ecore::EReference) in not containmentMetaFeature.oclIsUndefined() implies r.containment or r.eReferenceType.isSuperTypeOf(metaClass.ecoreClass)"/>
+ <details key="description" value="'Containment Meta Feature' must reference 'Meta Class' or its super-classes"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="childMetaFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Usually the same as containmentMetaFeature, unless you need to distinguish where to put and where to get from"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not childMetaFeature.oclIsUndefined() implies childMetaFeature.ecoreFeature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(metaClass.ecoreClass)"/>
+ <details key="description" value="'Child Meta Feature' must reference 'Meta Class' or its sub-classes"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelElementSelector" eType="#//GenConstraint"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Selection criterion for domain model elements associated with this type model facet"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="metaClass.ecoreClass"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelElementInitializer"
+ eType="#//GenElementInitializer" containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="State initializer for domain model elements associated with this type model facet"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TypeLinkModelFacet" eSuperTypes="#//TypeModelFacet #//LinkModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of an EClass that associates two EClasses"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not containmentMetaFeature.oclIsUndefined()"/>
+ <details key="description" value="Link 'Containment Meta Feature' must be specified"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sourceMetaFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="If source feature is not specified then link container is a link source"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not sourceMetaFeature.oclIsUndefined() implies sourceMetaFeature.genClass.ecoreClass.isSuperTypeOf(metaClass.ecoreClass)"/>
+ <details key="description" value="Link 'Source Meta Feature' must be owned by link 'Meta Class' or its super-class"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="targetMetaFeature" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not targetMetaFeature.oclIsUndefined() implies targetMetaFeature.genClass.ecoreClass.isSuperTypeOf(metaClass.ecoreClass)"/>
+ <details key="description" value="Link 'Target Meta Feature' must be owned by link 'Meta Class' or its super-class"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FeatureLinkModelFacet" eSuperTypes="#//LinkModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of a feature-based link"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metaFeature" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="metaFeature.ecoreFeature.unique"/>
+ <details key="description" value="All references are unique in EMF due to the current code generation"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelModelFacet" eSuperTypes="#//LabelModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of label based on domain model attribute(s)"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metaFeatures" lowerBound="1"
+ upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Pattern to produce label on diagram, depends on view method"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Pattern to produce text for inplace editor, depends on view method; if not specified then viewPattern should be used"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewMethod" eType="#//LabelTextAccessMethod"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="editMethod" eType="#//LabelTextAccessMethod"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="LabelTextAccessMethod">
+ <eLiterals name="MESSAGE_FORMAT"/>
+ <eLiterals name="NATIVE" value="1"/>
+ <eLiterals name="REGEXP" value="2"/>
+ <eLiterals name="PRINTF" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DesignLabelModelFacet" eSuperTypes="#//LabelModelFacet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Model facet of a label with DescriptionStyle"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Attributes" abstract="true" interface="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Captures aspects of variuos draw2d classes"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ColorAttributes" eSuperTypes="#//Attributes">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Deprecated, use StyleAttributes instead"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="foregroundColor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="backgroundColor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StyleAttributes" eSuperTypes="#//Attributes">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedFont" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedForeground" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="fixedBackground" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ResizeConstraints" eSuperTypes="#//Attributes">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Bit-wise OR of any {@link org.eclipse.draw2d.PositionConstants#NORTH}, {@link org.eclipse.draw2d.PositionConstants#SOUTH}, {@link org.eclipse.draw2d.PositionConstants#EAST} or {@link org.eclipse.draw2d.PositionConstants#WEST}"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="resizeHandles" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="0">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Any direction mentioned here (and combination thereof, like e.g. NORTH_WEST) is added as resizable handle"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonResizeHandles" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="0">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Directions mentioned with this attribute are explicitly denoted as non-resizable (i.e. with 'move' cursor). If you'd like to omit handle {@link org.eclipse.gef.editpolicies.ResizableEditPolicy#createSelectionHandles} completely, just don't list it here"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="resizeHandleNames" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+ volatile="true" transient="true" derived="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Convenient method to get {@link org.eclipse.draw2d.PositionConstants} names from resizeHandle attribute"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonResizeHandleNames" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+ volatile="true" transient="true" derived="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Same as {@link #getResizeHandleNames()}, for nonResizeHandle attribute"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DefaultSizeAttributes" eSuperTypes="#//Attributes">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="40"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="30"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="LabelOffsetAttributes" eSuperTypes="#//Attributes">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Viewmap" abstract="true">
+ <eOperations name="find" eType="#//Attributes">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns first attributes instance of specified class, if any"/>
+ </eAnnotations>
+ <eParameters name="attributesClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
+ eType="#//Attributes" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredPluginIDs" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="layoutType" eType="#//ViewmapLayoutType"
+ defaultValueLiteral="UNKNOWN"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="ViewmapLayoutType">
+ <eLiterals name="UNKNOWN"/>
+ <eLiterals name="XY_LAYOUT" value="1"/>
+ <eLiterals name="FLOW_LAYOUT" value="2"/>
+ <eLiterals name="TOOLBAR_LAYOUT" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FigureViewmap" eSuperTypes="#//Viewmap">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="figureQualifiedClassName"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Name of GEF Figure class"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SnippetViewmap" eSuperTypes="#//Viewmap">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="InnerClassViewmap" eSuperTypes="#//Viewmap">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="classBody" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ParentAssignedViewmap" eSuperTypes="#//Viewmap">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Figure (with specified class name, if any) will be assigned by (or should be taken from) parent"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="getterName" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Access figure from parent's figure"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="setterName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Child could provide typed alternative to setFigure() method"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="figureQualifiedClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="When specified, type of child's figure"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ValueExpression">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Expression as a is textual statement which results in a value when evaluated in a context"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="ValueSpec"/>
+ </eAnnotations>
+ <eOperations name="getBodyString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns valid String literal for the given &lt;code>String&lt;/code> as it should appear in java source code."/>
+ </eAnnotations>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The text of the expression"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="body"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" lowerBound="1"
+ eType="#//GenLanguage" defaultValueLiteral="ocl">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Specifies the language in which the expression is stated"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="langName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ changeable="false" volatile="true" transient="true" derived="true">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="lang"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenConstraint" eSuperTypes="#//ValueExpression">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Boolean type value expression which is to be evaluated in a context"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="Constraint"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Palette">
+ <eOperations name="getFactoryQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="definesStandardTools" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+ eType="#//GenDiagram" changeable="false" resolveProxies="false" eOpposite="#//GenDiagram/palette"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="flyout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="groups" lowerBound="1"
+ upperBound="-1" eType="#//ToolGroup" containment="true" eOpposite="#//ToolGroup/palette">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="GEF allows only containers as palette immediate children"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="factoryClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EntryBase" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="largeIconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="smallIconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="createMethodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractToolEntry" abstract="true" eSuperTypes="#//EntryBase #//ToolGroupItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedToolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Optional"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolEntry" eSuperTypes="#//AbstractToolEntry">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="genNodes" upperBound="-1"
+ eType="#//GenNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="genLinks" upperBound="-1"
+ eType="#//GenLink"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
+ eType="#//GenCommonBase" changeable="false" volatile="true" transient="true"
+ derived="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Enforces 'tool for either node or link' - if there are values in genNodes list, returns it (no respect to values in genLinks); returns value of genLinks otherwise"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StandardEntry" eSuperTypes="#//AbstractToolEntry">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//StandardEntryKind"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="StandardEntryKind">
+ <eLiterals name="SELECT"/>
+ <eLiterals name="MARQUEE" value="1"/>
+ <eLiterals name="ZOOM" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolGroupItem" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="group" eType="#//ToolGroup"
+ changeable="false" resolveProxies="false" eOpposite="#//ToolGroup/entries"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Separator" eSuperTypes="#//ToolGroupItem"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolGroup" eSuperTypes="#//EntryBase #//ToolGroupItem">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="palette" lowerBound="1"
+ eType="#//Palette" eOpposite="#//Palette/groups"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="stack" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapse" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="entries" lowerBound="1"
+ upperBound="-1" eType="#//ToolGroupItem" containment="true" eOpposite="#//ToolGroupItem/group"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolsOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenElementInitializer" abstract="true"
+ interface="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Base class for initializers of domain model elements"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="typeModelFacet" lowerBound="1"
+ eType="#//TypeModelFacet" changeable="false" volatile="true" transient="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The type model facet whose domain model element is to be intialized by this initializer"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenFeatureSeqInitializer" eSuperTypes="#//GenElementInitializer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Feature sequence initializer"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" lowerBound="1"
+ upperBound="-1" eType="#//GenFeatureInitializer" containment="true" eOpposite="#//GenFeatureInitializer/featureSeqInitializer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Value specifications as initializers for individual features which should be initialized in the order given by this list"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="self.elementClass"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elementClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not creatingInitializer.feature.oclIsUndefined() implies creatingInitializer.feature.ecoreFeature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(elementClass.ecoreClass)"/>
+ <details key="description" value="'elementClass' must be the same as or sub-type of the containing 'GenReferenceNewElementSpec' reference type"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.ecoreClass.interface or elementClass.ecoreClass.abstract)"/>
+ <details key="description" value="'elementClass' must be a concrete EClass which is the same or sub-type of the containing 'GenReferenceNewElementSpec' reference type"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="creatingInitializer" eType="#//GenReferenceNewElementSpec"
+ changeable="false" resolveProxies="false" eOpposite="#//GenReferenceNewElementSpec/newElementInitializers"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenFeatureValueSpec" eSuperTypes="#//ValueExpression #//GenFeatureInitializer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Value specification associated with a specific feature"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="ValueSpec"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="type"/>
+ <details key="ocl" value="feature.ecoreFeature"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenReferenceNewElementSpec" eSuperTypes="#//GenFeatureInitializer">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="feature &lt;> null implies feature.ecoreFeature.oclIsKindOf(ecore::EReference)"/>
+ <details key="description" value="'feature' of 'GenReferenceNewElementSpec' must refer to ecore::EReference"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="newElementInitializers"
+ lowerBound="1" upperBound="-1" eType="#//GenFeatureSeqInitializer" containment="true"
+ eOpposite="#//GenFeatureSeqInitializer/creatingInitializer"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenFeatureInitializer" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The feature for which is to be initialized by this initializer"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="feature &lt;> null implies not featureSeqInitializer.initializers->exists(i| i &lt;> self and i.feature = self.feature)"/>
+ <details key="description" value="The feature is already initialized by another 'GenFeatureInitializer' in the sequence"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="feature &lt;> null implies feature.ecoreFeature.eContainingClass.isSuperTypeOf(featureSeqInitializer.elementClass.ecoreClass)"/>
+ <details key="description" value="The 'feature' of 'GenFeatureInitializer' must be available in 'Meta Class' of the initialized element"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="featureSeqInitializer"
+ lowerBound="1" eType="#//GenFeatureSeqInitializer" changeable="false" resolveProxies="false"
+ eOpposite="#//GenFeatureSeqInitializer/initializers"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenLinkConstraints">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Groups constraints on the link source and target end"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not sourceEnd.oclIsUndefined() or not targetEnd.oclIsUndefined()"/>
+ <details key="description" value="Either 'sourceEnd' or 'targetEnd' constraint must be specified"/>
+ </eAnnotations>
+ <eOperations name="getLinkClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The domain meta element class of the link restricted by this constraints"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getSourceEndContextClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The context class for the source end constraint evaluation"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getTargetEndContextClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The context class for the target end constraint evaluation"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getConstraintsInstanceFieldName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Returns the name of the field holding Link Constraints instance"/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="isValid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="link" lowerBound="1" eType="#//GenLink"
+ eOpposite="#//GenLink/creationConstraints">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="References the owning link of this constraints"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEnd" eType="#//GenConstraint"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Restriction enforced by the the source end, may reference variables 'oppositeEnd' pointing to targetEnd and 'link' denoting the link domainmetaElement instance if available."/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="getSourceEndContextClass().ecoreClass"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="variable"/>
+ <details key="name" value="oppositeEnd"/>
+ <details key="type.ocl" value="getTargetEndContextClass().ecoreClass"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="targetEnd" eType="#//GenConstraint"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Restriction enforced by the the target end, may reference variables 'oppositeEnd' pointing to sourceEnd and 'link' denoting the link domainmetaElement instance if available."/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="getTargetEndContextClass().ecoreClass"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="variable"/>
+ <details key="name" value="oppositeEnd"/>
+ <details key="type.ocl" value="getSourceEndContextClass().ecoreClass"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenAuditRoot">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" lowerBound="1"
+ eType="#//GenEditorGenerator" changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/audits"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
+ eType="#//GenAuditContainer" containment="true" eOpposite="#//GenAuditContainer/root"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
+ eType="#//GenAuditRule" containment="true" eOpposite="#//GenAuditRule/root"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="clientContexts" upperBound="-1"
+ eType="#//GenAuditContext" containment="true" eOpposite="#//GenAuditContext/root"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenAuditContainer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Represents constraint category of emft.validation framework"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//GenAuditRoot"
+ changeable="false" resolveProxies="false" eOpposite="#//GenAuditRoot/categories"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Identifier which is unique within the scope of its parent container."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="A human readable name for the category of audits organized in this container"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The detailed description of this audit container"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" lowerBound="1" upperBound="-1"
+ eType="#//GenAuditContainer">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Hierarchical path of this audit container as ordered list of containers beginning with the root and ended with this container"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="audits" upperBound="-1"
+ eType="#//GenAuditRule" eOpposite="#//GenAuditRule/category"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenRuleBase" abstract="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Base class for rule like audit, metric rules..."/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="A human readable name of this rule"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The detailed description of this rule semantics"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenAuditRule" eSuperTypes="#//GenRuleBase">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Auditing rule in the form of a constraint evaluated against its target"/>
+ </eAnnotations>
+ <eOperations name="getConstraintAdapterQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getConstraintAdapterLocalClassName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//GenAuditRoot"
+ changeable="false" resolveProxies="false" eOpposite="#//GenAuditRoot/rules"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Unique identifier of this audit rule"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not id.oclIsUndefined() implies root.rules->one(i | i.id = self.id)"/>
+ <details key="description" value="Audit rule with the same ID already exists"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//GenConstraint"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="target.getContext()"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+ eType="#//GenAuditable" containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The target representing the context this audit is evaluated in"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The text message to be reported in case of this audit violation"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//GenSeverity"
+ defaultValueLiteral="ERROR">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Describes the severity of this audit rule violation"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="useInLiveMode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Indicates if this audit should be evaluated also in Live mode. If 'false', only Batch mode is applicable"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiresConstraintAdapter"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" changeable="false"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="category" lowerBound="1"
+ eType="#//GenAuditContainer" eOpposite="#//GenAuditContainer/audits"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="GenSeverity">
+ <eLiterals name="INFO"/>
+ <eLiterals name="WARNING" value="1"/>
+ <eLiterals name="ERROR" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenRuleTarget" abstract="true" interface="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The target against which a rule can be evaluated"/>
+ </eAnnotations>
+ <eOperations name="getContext" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClassifier">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets the classifier to be used as this rule target evaluation context"/>
+ </eAnnotations>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDomainElementTarget" eSuperTypes="#//GenAuditable #//GenMeasurable">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Target for rules applied on domain model elements"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Targeted domain model element"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDiagramElementTarget" eSuperTypes="#//GenAuditable #//GenMeasurable">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Target for rules applied on diagram notation model selectively, for specific visualized element"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
+ upperBound="-1" eType="#//GenCommonBase">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Targeted visualized element"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="element &lt;> null and element->size() > 1 implies element->forAll(oclIsKindOf(GenNode))"/>
+ <details key="description" value="Multiple diagram elements must be GenNode type conformant"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDomainAttributeTarget" eSuperTypes="#//GenAuditable">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Represents value based target, useful for audit rules expression not capable of ecore meta-model access"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenFeature">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="attribute.ecoreFeature.oclIsKindOf(ecore::EAttribute)"/>
+ <details key="description" value="EAttribute element required for auditable domain attribute"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullAsError" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Indicates whether null value of the attribute is reported as audit failure or success"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNotationElementTarget" eSuperTypes="#//GenAuditable #//GenMeasurable">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Target for rules applied on diagram notation model elements"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Targeted diagram notation model element"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="element.ecoreClass.eAllSuperTypes->including(element.ecoreClass)->one(ePackage.name = 'notation' and name = 'View')"/>
+ <details key="description" value="'notation::View' or its sub-class must be set to NotationElement target"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenMetricContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" lowerBound="1"
+ eType="#//GenEditorGenerator" changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/metrics"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metrics" lowerBound="1"
+ upperBound="-1" eType="#//GenMetricRule" containment="true" eOpposite="#//GenMetricRule/container"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenMetricRule" eSuperTypes="#//GenRuleBase">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not lowLimit.oclIsUndefined() and not highLimit.oclIsUndefined() implies lowLimit &lt; highLimit"/>
+ <details key="description" value="Metric value 'lowLimit' must be smaller then 'highLimit'"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Unique key identifying this metric an abbreviation for this metric"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not key.oclIsUndefined() implies container.metrics->one(i | i.key = self.key)"/>
+ <details key="description" value="Metric rule with the same 'key' already exists"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//ValueExpression"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="context"/>
+ <details key="ocl" value="target.getContext()"/>
+ </eAnnotations>
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
+ <details key="def" value="type"/>
+ <details key="ocl" value="'ecore::EDoubleObject'"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
+ eType="#//GenMeasurable" containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The target representing the context this metric is evaluated in"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowLimit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="highLimit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
+ eType="#//GenMetricContainer" eOpposite="#//GenMetricContainer/metrics">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="The containing metric container of this metric rule"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenAuditedMetricTarget" eSuperTypes="#//GenAuditable">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Target metric which can be evaluated by audit rule. The target context here is the metric rule resulting type classifier"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metric" lowerBound="1"
+ eType="#//GenMetricRule">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Metric wich can be involved in audit"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="metricValueContext" lowerBound="1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenDataType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenAuditable" abstract="true" eSuperTypes="#//GenRuleTarget">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Target suitable for auditing"/>
+ </eAnnotations>
+ <eOperations name="getTargetClass" eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Gets the validation target class in terms of EMFT validation framework."/>
+ </eAnnotations>
+ </eOperations>
+ <eOperations name="getTargetClassModelQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Consists of ecore meta-model only package names and target class simple name"/>
+ </eAnnotations>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="contextSelector" eType="#//GenAuditContext"
+ eOpposite="#//GenAuditContext/ruleTargets">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="To apply audit to this target, we need to select appropriate input, and here's selector that helps with that"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenAuditContext">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value=""/>
+ </eAnnotations>
+ <eOperations name="getQualifiedClassName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//GenAuditRoot"
+ resolveProxies="false" eOpposite="#//GenAuditRoot/clientContexts"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="DefaultCtx">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Identifier of the validation client context for this target. Should be a valid java identifier. Identifier will be qualified automatically (i.e. should be unique within this editor only)."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Unless explicitly set, equals to 'id'. Note, this class may get generated as inner class."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ruleTargets" upperBound="-1"
+ eType="#//GenAuditable" eOpposite="#//GenAuditable/contextSelector"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenMeasurable" abstract="true" interface="true"
+ eSuperTypes="#//GenRuleTarget">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Marker interface for anything that can be subject to metrics"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenExpressionProviderContainer">
+ <eOperations name="getProvider" eType="#//GenExpressionProviderBase">
+ <eParameters name="expression" lowerBound="1" eType="#//ValueExpression"/>
+ </eOperations>
+ <eOperations name="getAbstractExpressionQualifiedClassName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="expressionsPackageName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractExpressionClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="providers" upperBound="-1"
+ eType="#//GenExpressionProviderBase" containment="true" eOpposite="#//GenExpressionProviderBase/container"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" lowerBound="1"
+ eType="#//GenEditorGenerator" changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/expressionProviders"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenExpressionProviderBase" abstract="true">
+ <eOperations name="getLanguage" lowerBound="1" eType="#//GenLanguage"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" upperBound="-1"
+ eType="#//ValueExpression"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
+ eType="#//GenExpressionProviderContainer" changeable="false" resolveProxies="false"
+ eOpposite="#//GenExpressionProviderContainer/providers"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenJavaExpressionProvider" eSuperTypes="#//GenExpressionProviderBase">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="throwException" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentaion" value="Whether to generate default implementation that rises RuntimeException to signal unimplemented method"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="injectExpressionBody" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="When 'true', body of associated ValueExpression would get injected into Java code as-is, thus allowing to provide method implementations right within the model. Note, if body is empty, default implementation would be generated instead."/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenExpressionInterpreter" eSuperTypes="#//GenExpressionProviderBase">
+ <eOperations name="getQualifiedClassName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getExpressionAccessor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="expression" lowerBound="1" eType="#//ValueExpression"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" lowerBound="1"
+ eType="#//GenLanguage"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="GenLanguage">
+ <eLiterals name="ocl"/>
+ <eLiterals name="java" value="1"/>
+ <eLiterals name="regexp" value="2"/>
+ <eLiterals name="nregexp" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenDomainModelNavigator" abstract="true"
+ interface="true">
+ <eOperations name="getDomainContentProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDomainLabelProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDomainModelElementTesterQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getDomainNavigatorItemQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateDomainModelNavigator"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainContentExtensionID"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainContentExtensionName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainContentExtensionPriority"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainContentProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainLabelProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainModelElementTesterClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="domainNavigatorItemClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNavigator" eSuperTypes="#//GenDomainModelNavigator">
+ <eOperations name="getContentProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLabelProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLinkHelperQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getSorterQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getActionProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getAbstractNavigatorItemQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getNavigatorGroupQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getNavigatorItemQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getUriInputTesterQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" eType="#//GenEditorGenerator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/navigator"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentExtensionID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentExtensionName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentExtensionPriority"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkHelperExtensionID"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sorterExtensionID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="actionProviderID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="linkHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="sorterClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="actionProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstractNavigatorItemClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="navigatorGroupClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="navigatorItemClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uriInputTesterClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="childReferences" upperBound="-1"
+ eType="#//GenNavigatorChildReference" containment="true" eOpposite="#//GenNavigatorChildReference/navigator"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="GenNavigatorReferenceType">
+ <eLiterals name="children"/>
+ <eLiterals name="out_target" value="1"/>
+ <eLiterals name="in_source" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNavigatorChildReference">
+ <eOperations name="isInsideGroup" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="findConnectionPaths" upperBound="-1" eType="#//GenNavigatorPath"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="navigator" eType="#//GenNavigator"
+ changeable="false" resolveProxies="false" eOpposite="#//GenNavigator/childReferences"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//GenCommonBase"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="child" lowerBound="1" eType="#//GenCommonBase"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceType" lowerBound="1"
+ eType="#//GenNavigatorReferenceType"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="groupName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="groupIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="hideIfEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNavigatorPath">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="segments" upperBound="-1"
+ eType="#//GenNavigatorPathSegment" containment="true" eOpposite="#//GenNavigatorPathSegment/path"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenNavigatorPathSegment">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="path" eType="#//GenNavigatorPath"
+ changeable="false" resolveProxies="false" eOpposite="#//GenNavigatorPath/segments"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="from" lowerBound="1" eType="#//GenCommonBase"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="to" lowerBound="1" eType="#//GenCommonBase"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenPropertySheet">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Sheet consists of few categories (aka tabs)"/>
+ </eAnnotations>
+ <eOperations name="getLabelProviderQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" lowerBound="1"
+ eType="#//GenEditorGenerator" changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/propertySheet"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="tabs" lowerBound="1" upperBound="-1"
+ eType="#//GenPropertyTab" containment="true" eOpposite="#//GenPropertyTab/sheet"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="needsCaption" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelProviderClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenPropertyTab" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sheet" lowerBound="1" eType="#//GenPropertySheet"
+ changeable="false" resolveProxies="false" eOpposite="#//GenPropertySheet/tabs"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenStandardPropertyTab" eSuperTypes="#//GenPropertyTab">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Standard property category plugs in predefined sets of properties (provided by runtime). Identifiers 'appearance', 'diagram' and 'advanced' are known at the moment"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenCustomPropertyTab" eSuperTypes="#//GenPropertyTab">
+ <eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="filter" eType="#//GenPropertyTabFilter"
+ containment="true" eOpposite="#//GenPropertyTabFilter/tab"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenPropertyTabFilter" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="tab" lowerBound="1" eType="#//GenCustomPropertyTab"
+ changeable="false" resolveProxies="false" eOpposite="#//GenCustomPropertyTab/filter"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TypeTabFilter" eSuperTypes="#//GenPropertyTabFilter">
+ <eOperations name="getAllTypes" lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="types" lowerBound="1" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Fully-qualified class names for selection to match"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="generatedTypes" upperBound="-1"
+ eType="#//GeneratedType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="GeneratedType">
+ <eLiterals name="abstractNavigatorItem"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CustomTabFilter" eSuperTypes="#//GenPropertyTabFilter">
+ <eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenContributionItem" abstract="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Element of UI contribution"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//GenContributionManager"
+ changeable="false" resolveProxies="false" eOpposite="#//GenContributionManager/items"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="application" eType="#//GenApplication"
+ changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenSharedContributionItem" eSuperTypes="#//GenContributionItem">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Reference to the shared contribution item"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="actualItem" lowerBound="1"
+ eType="#//GenContributionItem">
+ <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
+ <details key="ocl" value="not actualItem.oclIsKindOf(gmfgen::GenSharedContributionItem)"/>
+ <details key="description" value="Actual contribution item can't be a reference"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenGroupMarker" eSuperTypes="#//GenContributionItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="groupName" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenSeparator" eSuperTypes="#//GenContributionItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="groupName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenActionFactoryContributionItem" eSuperTypes="#//GenContributionItem">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Action from org.eclipse.ui.actions.ActionFactory"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="ActionFactory field name such as 'ABOUT'"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenContributionManager" abstract="true"
+ eSuperTypes="#//GenContributionItem">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Group of UI contribution items"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
+ eType="#//GenContributionItem" containment="true" eOpposite="#//GenContributionItem/owner"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenMenuManager" eSuperTypes="#//GenContributionManager">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenToolBarManager" eSuperTypes="#//GenContributionManager"/>
+ <eClassifiers xsi:type="ecore:EClass" name="GenApplication">
+ <eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getWorkbenchAdvisorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getWorkbenchWindowAdvisorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getActionBarAdvisorQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getPerspectiveQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="editorGen" lowerBound="1"
+ eType="#//GenEditorGenerator" changeable="false" resolveProxies="false" eOpposite="#//GenEditorGenerator/application"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="RCP Application ID for plugin.xml"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="workbenchAdvisorClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="workbenchWindowAdvisorClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="actionBarAdvisorClassName"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+ volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="perspectiveClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ changeable="false" volatile="true" transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="perspectiveId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="supportFiles" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Option to create/save/open diagrams in/from java files"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sharedContributionItems"
+ upperBound="-1" eType="#//GenContributionItem" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mainMenu" eType="#//GenMenuManager"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mainToolBar" eType="#//GenToolBarManager"
+ containment="true"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.gmf.codegen/plugin.xml b/plugins/org.eclipse.gmf.codegen/plugin.xml
index f8495c41c..124c5e98b 100644
--- a/plugins/org.eclipse.gmf.codegen/plugin.xml
+++ b/plugins/org.eclipse.gmf.codegen/plugin.xml
@@ -12,11 +12,19 @@
class = "org.eclipse.gmf.codegen.gmfgen.GMFGenPackage"
genModel = "models/gmfgen.genmodel" />
<package
- uri = "http://www.eclipse.org/gmf/2006/GenModel"
+ uri = "http://www.eclipse.org/gmf/2008/GenModel"
class = "org.eclipse.gmf.codegen.gmfgen.GMFGenPackage"
genModel = "models/gmfgen.genmodel" />
</extension>
+ <extension
+ point="org.eclipse.emf.ecore.dynamic_package">
+ <resource
+ location="models/gmfgen_2007.ecore"
+ uri="http://www.eclipse.org/gmf/2006/GenModel">
+ </resource>
+ </extension>
+
<extension point="org.eclipse.emf.ecore.extension_parser">
<parser type="gmfgen" class="org.eclipse.gmf.internal.codegen.util.GMFGenResource$Factory" />
</extension>
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
index afad2c3b4..c74b5fd92 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
@@ -44,7 +44,7 @@ public interface GMFGenPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://www.eclipse.org/gmf/2006/GenModel";
+ String eNS_URI = "http://www.eclipse.org/gmf/2008/GenModel";
/**
* The package namespace name.
@@ -5576,7 +5576,7 @@ public interface GMFGenPackage extends EPackage {
int TYPE_MODEL_FACET__CHILD_META_FEATURE = MODEL_FACET_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Model Element Selector</b></em>' containment reference.
+ * The feature id for the '<em><b>Model Element Selector</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -5650,7 +5650,7 @@ public interface GMFGenPackage extends EPackage {
int TYPE_LINK_MODEL_FACET__CHILD_META_FEATURE = TYPE_MODEL_FACET__CHILD_META_FEATURE;
/**
- * The feature id for the '<em><b>Model Element Selector</b></em>' containment reference.
+ * The feature id for the '<em><b>Model Element Selector</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -6388,22 +6388,22 @@ public interface GMFGenPackage extends EPackage {
int VALUE_EXPRESSION__BODY = 0;
/**
- * The feature id for the '<em><b>Language</b></em>' attribute.
+ * The feature id for the '<em><b>Lang Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int VALUE_EXPRESSION__LANGUAGE = 1;
+ int VALUE_EXPRESSION__LANG_NAME = 1;
/**
- * The feature id for the '<em><b>Lang Name</b></em>' attribute.
+ * The feature id for the '<em><b>Provider</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int VALUE_EXPRESSION__LANG_NAME = 2;
+ int VALUE_EXPRESSION__PROVIDER = 2;
/**
* The number of structural features of the '<em>Value Expression</em>' class.
@@ -6434,22 +6434,22 @@ public interface GMFGenPackage extends EPackage {
int GEN_CONSTRAINT__BODY = VALUE_EXPRESSION__BODY;
/**
- * The feature id for the '<em><b>Language</b></em>' attribute.
+ * The feature id for the '<em><b>Lang Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GEN_CONSTRAINT__LANGUAGE = VALUE_EXPRESSION__LANGUAGE;
+ int GEN_CONSTRAINT__LANG_NAME = VALUE_EXPRESSION__LANG_NAME;
/**
- * The feature id for the '<em><b>Lang Name</b></em>' attribute.
+ * The feature id for the '<em><b>Provider</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GEN_CONSTRAINT__LANG_NAME = VALUE_EXPRESSION__LANG_NAME;
+ int GEN_CONSTRAINT__PROVIDER = VALUE_EXPRESSION__PROVIDER;
/**
* The number of structural features of the '<em>Gen Constraint</em>' class.
@@ -7152,31 +7152,14 @@ public interface GMFGenPackage extends EPackage {
int GEN_FEATURE_VALUE_SPEC = 77;
/**
- * The feature id for the '<em><b>Body</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int GEN_FEATURE_VALUE_SPEC__BODY = VALUE_EXPRESSION__BODY;
-
- /**
- * The feature id for the '<em><b>Language</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int GEN_FEATURE_VALUE_SPEC__LANGUAGE = VALUE_EXPRESSION__LANGUAGE;
-
- /**
- * The feature id for the '<em><b>Lang Name</b></em>' attribute.
+ * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenFeatureInitializer <em>Gen Feature Initializer</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see org.eclipse.gmf.codegen.gmfgen.GenFeatureInitializer
+ * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenFeatureInitializer()
* @generated
- * @ordered
*/
- int GEN_FEATURE_VALUE_SPEC__LANG_NAME = VALUE_EXPRESSION__LANG_NAME;
+ int GEN_FEATURE_INITIALIZER = 79;
/**
* The feature id for the '<em><b>Feature</b></em>' reference.
@@ -7185,7 +7168,7 @@ public interface GMFGenPackage extends EPackage {
* @generated
* @ordered
*/
- int GEN_FEATURE_VALUE_SPEC__FEATURE = VALUE_EXPRESSION_FEATURE_COUNT + 0;
+ int GEN_FEATURE_INITIALIZER__FEATURE = 0;
/**
* The feature id for the '<em><b>Feature Seq Initializer</b></em>' container reference.
@@ -7194,53 +7177,52 @@ public interface GMFGenPackage extends EPackage {
* @generated
* @ordered
*/
- int GEN_FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER = VALUE_EXPRESSION_FEATURE_COUNT + 1;
+ int GEN_FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER = 1;
/**
- * The number of structural features of the '<em>Gen Feature Value Spec</em>' class.
+ * The number of structural features of the '<em>Gen Feature Initializer</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GEN_FEATURE_VALUE_SPEC_FEATURE_COUNT = VALUE_EXPRESSION_FEATURE_COUNT + 2;
+ int GEN_FEATURE_INITIALIZER_FEATURE_COUNT = 2;
/**
- * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenFeatureInitializer <em>Gen Feature Initializer</em>}' class.
+ * The feature id for the '<em><b>Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.gmf.codegen.gmfgen.GenFeatureInitializer
- * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenFeatureInitializer()
* @generated
+ * @ordered
*/
- int GEN_FEATURE_INITIALIZER = 79;
+ int GEN_FEATURE_VALUE_SPEC__FEATURE = GEN_FEATURE_INITIALIZER__FEATURE;
/**
- * The feature id for the '<em><b>Feature</b></em>' reference.
+ * The feature id for the '<em><b>Feature Seq Initializer</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GEN_FEATURE_INITIALIZER__FEATURE = 0;
+ int GEN_FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER = GEN_FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER;
/**
- * The feature id for the '<em><b>Feature Seq Initializer</b></em>' container reference.
+ * The feature id for the '<em><b>Value</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GEN_FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER = 1;
+ int GEN_FEATURE_VALUE_SPEC__VALUE = GEN_FEATURE_INITIALIZER_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>Gen Feature Initializer</em>' class.
+ * The number of structural features of the '<em>Gen Feature Value Spec</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int GEN_FEATURE_INITIALIZER_FEATURE_COUNT = 2;
+ int GEN_FEATURE_VALUE_SPEC_FEATURE_COUNT = GEN_FEATURE_INITIALIZER_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenReferenceNewElementSpecImpl <em>Gen Reference New Element Spec</em>}' class.
@@ -7308,7 +7290,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_LINK_CONSTRAINTS__LINK = 0;
/**
- * The feature id for the '<em><b>Source End</b></em>' containment reference.
+ * The feature id for the '<em><b>Source End</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -7317,7 +7299,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_LINK_CONSTRAINTS__SOURCE_END = 1;
/**
- * The feature id for the '<em><b>Target End</b></em>' containment reference.
+ * The feature id for the '<em><b>Target End</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -7546,7 +7528,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_AUDIT_RULE__ID = GEN_RULE_BASE_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Rule</b></em>' containment reference.
+ * The feature id for the '<em><b>Rule</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -7896,7 +7878,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_METRIC_RULE__KEY = GEN_RULE_BASE_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Rule</b></em>' containment reference.
+ * The feature id for the '<em><b>Rule</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -8135,7 +8117,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_EXPRESSION_PROVIDER_BASE = 97;
/**
- * The feature id for the '<em><b>Expressions</b></em>' reference list.
+ * The feature id for the '<em><b>Expressions</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -8172,7 +8154,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_JAVA_EXPRESSION_PROVIDER = 98;
/**
- * The feature id for the '<em><b>Expressions</b></em>' reference list.
+ * The feature id for the '<em><b>Expressions</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -8227,7 +8209,7 @@ public interface GMFGenPackage extends EPackage {
int GEN_EXPRESSION_INTERPRETER = 99;
/**
- * The feature id for the '<em><b>Expressions</b></em>' reference list.
+ * The feature id for the '<em><b>Expressions</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -12714,10 +12696,10 @@ public interface GMFGenPackage extends EPackage {
EReference getTypeModelFacet_ChildMetaFeature();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.gmf.codegen.gmfgen.TypeModelFacet#getModelElementSelector <em>Model Element Selector</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.TypeModelFacet#getModelElementSelector <em>Model Element Selector</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Model Element Selector</em>'.
+ * @return the meta object for the reference '<em>Model Element Selector</em>'.
* @see org.eclipse.gmf.codegen.gmfgen.TypeModelFacet#getModelElementSelector()
* @see #getTypeModelFacet()
* @generated
@@ -13259,26 +13241,26 @@ public interface GMFGenPackage extends EPackage {
EAttribute getValueExpression_Body();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLanguage <em>Language</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLangName <em>Lang Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Language</em>'.
- * @see org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLanguage()
+ * @return the meta object for the attribute '<em>Lang Name</em>'.
+ * @see org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLangName()
* @see #getValueExpression()
* @generated
*/
- EAttribute getValueExpression_Language();
+ EAttribute getValueExpression_LangName();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLangName <em>Lang Name</em>}'.
+ * Returns the meta object for the container reference '{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getProvider <em>Provider</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Lang Name</em>'.
- * @see org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLangName()
+ * @return the meta object for the container reference '<em>Provider</em>'.
+ * @see org.eclipse.gmf.codegen.gmfgen.ValueExpression#getProvider()
* @see #getValueExpression()
* @generated
*/
- EAttribute getValueExpression_LangName();
+ EReference getValueExpression_Provider();
/**
* Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.GenConstraint <em>Gen Constraint</em>}'.
@@ -13698,6 +13680,17 @@ public interface GMFGenPackage extends EPackage {
EClass getGenFeatureValueSpec();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec#getValue <em>Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Value</em>'.
+ * @see org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec#getValue()
+ * @see #getGenFeatureValueSpec()
+ * @generated
+ */
+ EReference getGenFeatureValueSpec_Value();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.GenReferenceNewElementSpec <em>Gen Reference New Element Spec</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -13772,10 +13765,10 @@ public interface GMFGenPackage extends EPackage {
EReference getGenLinkConstraints_Link();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getSourceEnd <em>Source End</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getSourceEnd <em>Source End</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Source End</em>'.
+ * @return the meta object for the reference '<em>Source End</em>'.
* @see org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getSourceEnd()
* @see #getGenLinkConstraints()
* @generated
@@ -13783,10 +13776,10 @@ public interface GMFGenPackage extends EPackage {
EReference getGenLinkConstraints_SourceEnd();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getTargetEnd <em>Target End</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getTargetEnd <em>Target End</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Target End</em>'.
+ * @return the meta object for the reference '<em>Target End</em>'.
* @see org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getTargetEnd()
* @see #getGenLinkConstraints()
* @generated
@@ -13988,10 +13981,10 @@ public interface GMFGenPackage extends EPackage {
EAttribute getGenAuditRule_Id();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.gmf.codegen.gmfgen.GenAuditRule#getRule <em>Rule</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.GenAuditRule#getRule <em>Rule</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Rule</em>'.
+ * @return the meta object for the reference '<em>Rule</em>'.
* @see org.eclipse.gmf.codegen.gmfgen.GenAuditRule#getRule()
* @see #getGenAuditRule()
* @generated
@@ -14223,10 +14216,10 @@ public interface GMFGenPackage extends EPackage {
EAttribute getGenMetricRule_Key();
/**
- * Returns the meta object for the containment reference '{@link org.eclipse.gmf.codegen.gmfgen.GenMetricRule#getRule <em>Rule</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.GenMetricRule#getRule <em>Rule</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Rule</em>'.
+ * @return the meta object for the reference '<em>Rule</em>'.
* @see org.eclipse.gmf.codegen.gmfgen.GenMetricRule#getRule()
* @see #getGenMetricRule()
* @generated
@@ -14459,10 +14452,10 @@ public interface GMFGenPackage extends EPackage {
EClass getGenExpressionProviderBase();
/**
- * Returns the meta object for the reference list '{@link org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase#getExpressions <em>Expressions</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase#getExpressions <em>Expressions</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Expressions</em>'.
+ * @return the meta object for the containment reference list '<em>Expressions</em>'.
* @see org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase#getExpressions()
* @see #getGenExpressionProviderBase()
* @generated
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenAuditRule.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenAuditRule.java
index 094e55e47..bbaf58068 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenAuditRule.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenAuditRule.java
@@ -110,7 +110,7 @@ public interface GenAuditRule extends GenRuleBase {
void setMessage(String value);
/**
- * Returns the value of the '<em><b>Rule</b></em>' containment reference.
+ * Returns the value of the '<em><b>Rule</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Rule</em>' reference isn't clear,
@@ -120,20 +120,20 @@ public interface GenAuditRule extends GenRuleBase {
* <!-- begin-model-doc -->
* A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target
* <!-- end-model-doc -->
- * @return the value of the '<em>Rule</em>' containment reference.
+ * @return the value of the '<em>Rule</em>' reference.
* @see #setRule(GenConstraint)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenAuditRule_Rule()
- * @model containment="true" required="true"
+ * @model required="true"
* annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='target.getContext()'"
* @generated
*/
GenConstraint getRule();
/**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenAuditRule#getRule <em>Rule</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenAuditRule#getRule <em>Rule</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Rule</em>' containment reference.
+ * @param value the new value of the '<em>Rule</em>' reference.
* @see #getRule()
* @generated
*/
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderBase.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderBase.java
index f208f4ee5..208891f00 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderBase.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderBase.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GenExpressionProviderBase.java,v 1.12 2008/04/18 14:43:20 atikhomirov Exp $
+ * $Id: GenExpressionProviderBase.java,v 1.13 2008/05/07 13:56:01 atikhomirov Exp $
*/
package org.eclipse.gmf.codegen.gmfgen;
@@ -40,17 +40,19 @@ public interface GenExpressionProviderBase extends EObject {
GenLanguage getLanguage();
/**
- * Returns the value of the '<em><b>Expressions</b></em>' reference list.
+ * Returns the value of the '<em><b>Expressions</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.gmf.codegen.gmfgen.ValueExpression}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getProvider <em>Provider</em>}'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Expressions</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Expressions</em>' reference list.
+ * @return the value of the '<em>Expressions</em>' containment reference list.
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenExpressionProviderBase_Expressions()
- * @model
+ * @see org.eclipse.gmf.codegen.gmfgen.ValueExpression#getProvider
+ * @model opposite="provider" containment="true" required="true"
* @generated
*/
EList<ValueExpression> getExpressions();
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderContainer.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderContainer.java
index 0fd69fa8d..393f7adaa 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderContainer.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenExpressionProviderContainer.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GenExpressionProviderContainer.java,v 1.9 2008/05/05 21:06:41 atikhomirov Exp $
+ * $Id: GenExpressionProviderContainer.java,v 1.10 2008/05/07 13:56:01 atikhomirov Exp $
*/
package org.eclipse.gmf.codegen.gmfgen;
@@ -119,14 +119,6 @@ public interface GenExpressionProviderContainer extends EObject {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @model expressionRequired="true"
- * @generated
- */
- GenExpressionProviderBase getProvider(ValueExpression expression);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
* @model kind="operation" required="true"
* @generated
*/
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenFeatureValueSpec.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenFeatureValueSpec.java
index acefd1159..949fd844a 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenFeatureValueSpec.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenFeatureValueSpec.java
@@ -16,11 +16,43 @@ package org.eclipse.gmf.codegen.gmfgen;
* Value specification associated with a specific feature
* <!-- end-model-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenFeatureValueSpec()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='ValueSpec'"
- * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='feature.ecoreFeature'"
+ * @model
* @generated
*/
-public interface GenFeatureValueSpec extends ValueExpression, GenFeatureInitializer {
+public interface GenFeatureValueSpec extends GenFeatureInitializer {
+
+ /**
+ * Returns the value of the '<em><b>Value</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Value</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Value</em>' reference.
+ * @see #setValue(ValueExpression)
+ * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenFeatureValueSpec_Value()
+ * @model required="true"
+ * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='featureSeqInitializer.elementClass'"
+ * @generated
+ */
+ ValueExpression getValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec#getValue <em>Value</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Value</em>' reference.
+ * @see #getValue()
+ * @generated
+ */
+ void setValue(ValueExpression value);
} // GenFeatureValueSpec
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenJavaExpressionProvider.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenJavaExpressionProvider.java
index 0aeb0b21a..79ca10db4 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenJavaExpressionProvider.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenJavaExpressionProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GenJavaExpressionProvider.java,v 1.2 2008/05/05 21:06:41 atikhomirov Exp $
+ * $Id: GenJavaExpressionProvider.java,v 1.3 2008/05/07 13:56:01 atikhomirov Exp $
*/
package org.eclipse.gmf.codegen.gmfgen;
@@ -62,13 +62,11 @@ public interface GenJavaExpressionProvider extends GenExpressionProviderBase {
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * When 'true', body of associated ValueExpression would get injected into Java code as-is, thus allowing to provide method implementations right within the model. Note, if body is empty, default implementation would be generated instead.
- * <!-- end-model-doc -->
* @return the value of the '<em>Inject Expression Body</em>' attribute.
* @see #setInjectExpressionBody(boolean)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenJavaExpressionProvider_InjectExpressionBody()
* @model default="false"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel documentaion='When \'true\', body of associated ValueExpression would get injected into Java code as-is, thus allowing to provide method implementations right within the model. Note, if body is empty, default implementation would be generated instead.'"
* @generated
*/
boolean isInjectExpressionBody();
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenLinkConstraints.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenLinkConstraints.java
index 614e4d5ae..6ac296ca5 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenLinkConstraints.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenLinkConstraints.java
@@ -65,7 +65,7 @@ public interface GenLinkConstraints extends EObject {
void setLink(GenLink value);
/**
- * Returns the value of the '<em><b>Source End</b></em>' containment reference.
+ * Returns the value of the '<em><b>Source End</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Source End</em>' reference isn't clear,
@@ -75,28 +75,27 @@ public interface GenLinkConstraints extends EObject {
* <!-- begin-model-doc -->
* Restriction enforced by the the source end, may reference variables 'oppositeEnd' pointing to targetEnd and 'link' denoting the link domainmetaElement instance if available.
* <!-- end-model-doc -->
- * @return the value of the '<em>Source End</em>' containment reference.
+ * @return the value of the '<em>Source End</em>' reference.
* @see #setSourceEnd(GenConstraint)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenLinkConstraints_SourceEnd()
- * @model containment="true"
- * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='getSourceEndContextClass().ecoreClass'"
+ * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='getSourceEndContextClass().ecoreClass'"
* annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='variable' name='oppositeEnd' type.ocl='getTargetEndContextClass().ecoreClass'"
* @generated
*/
GenConstraint getSourceEnd();
/**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getSourceEnd <em>Source End</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getSourceEnd <em>Source End</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Source End</em>' containment reference.
+ * @param value the new value of the '<em>Source End</em>' reference.
* @see #getSourceEnd()
* @generated
*/
void setSourceEnd(GenConstraint value);
/**
- * Returns the value of the '<em><b>Target End</b></em>' containment reference.
+ * Returns the value of the '<em><b>Target End</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Target End</em>' reference isn't clear,
@@ -106,21 +105,20 @@ public interface GenLinkConstraints extends EObject {
* <!-- begin-model-doc -->
* Restriction enforced by the the target end, may reference variables 'oppositeEnd' pointing to sourceEnd and 'link' denoting the link domainmetaElement instance if available.
* <!-- end-model-doc -->
- * @return the value of the '<em>Target End</em>' containment reference.
+ * @return the value of the '<em>Target End</em>' reference.
* @see #setTargetEnd(GenConstraint)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenLinkConstraints_TargetEnd()
- * @model containment="true"
- * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='getTargetEndContextClass().ecoreClass'"
+ * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='getTargetEndContextClass().ecoreClass'"
* annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='variable' name='oppositeEnd' type.ocl='getSourceEndContextClass().ecoreClass'"
* @generated
*/
GenConstraint getTargetEnd();
/**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getTargetEnd <em>Target End</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints#getTargetEnd <em>Target End</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Target End</em>' containment reference.
+ * @param value the new value of the '<em>Target End</em>' reference.
* @see #getTargetEnd()
* @generated
*/
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenMetricRule.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenMetricRule.java
index 0674cd125..c36179a24 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenMetricRule.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenMetricRule.java
@@ -56,16 +56,16 @@ public interface GenMetricRule extends GenRuleBase {
void setKey(String value);
/**
- * Returns the value of the '<em><b>Rule</b></em>' containment reference.
+ * Returns the value of the '<em><b>Rule</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives
* <!-- end-model-doc -->
- * @return the value of the '<em>Rule</em>' containment reference.
+ * @return the value of the '<em>Rule</em>' reference.
* @see #setRule(ValueExpression)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenMetricRule_Rule()
- * @model containment="true" required="true"
+ * @model required="true"
* annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='target.getContext()'"
* annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='\'ecore::EDoubleObject\''"
* @generated
@@ -73,10 +73,10 @@ public interface GenMetricRule extends GenRuleBase {
ValueExpression getRule();
/**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenMetricRule#getRule <em>Rule</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenMetricRule#getRule <em>Rule</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Rule</em>' containment reference.
+ * @param value the new value of the '<em>Rule</em>' reference.
* @see #getRule()
* @generated
*/
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/TypeModelFacet.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/TypeModelFacet.java
index 77daa77e7..79eeec5cc 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/TypeModelFacet.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/TypeModelFacet.java
@@ -112,26 +112,25 @@ public interface TypeModelFacet extends ModelFacet {
void setChildMetaFeature(GenFeature value);
/**
- * Returns the value of the '<em><b>Model Element Selector</b></em>' containment reference.
+ * Returns the value of the '<em><b>Model Element Selector</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* Selection criterion for domain model elements associated with this type model facet
* <!-- end-model-doc -->
- * @return the value of the '<em>Model Element Selector</em>' containment reference.
+ * @return the value of the '<em>Model Element Selector</em>' reference.
* @see #setModelElementSelector(GenConstraint)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getTypeModelFacet_ModelElementSelector()
- * @model containment="true"
- * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='metaClass.ecoreClass'"
+ * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='metaClass.ecoreClass'"
* @generated
*/
GenConstraint getModelElementSelector();
/**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.TypeModelFacet#getModelElementSelector <em>Model Element Selector</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.TypeModelFacet#getModelElementSelector <em>Model Element Selector</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Model Element Selector</em>' containment reference.
+ * @param value the new value of the '<em>Model Element Selector</em>' reference.
* @see #getModelElementSelector()
* @generated
*/
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/ValueExpression.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/ValueExpression.java
index fa4e2b2b3..a7f283d6f 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/ValueExpression.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/ValueExpression.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getBody <em>Body</em>}</li>
- * <li>{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLanguage <em>Language</em>}</li>
* <li>{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLangName <em>Lang Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getProvider <em>Provider</em>}</li>
* </ul>
* </p>
*
@@ -62,53 +62,37 @@ public interface ValueExpression extends EObject {
void setBody(String value);
/**
- * Returns the value of the '<em><b>Language</b></em>' attribute.
- * The default value is <code>"ocl"</code>.
- * The literals are from the enumeration {@link org.eclipse.gmf.codegen.gmfgen.GenLanguage}.
+ * Returns the value of the '<em><b>Lang Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Language</em>' attribute isn't clear,
+ * If the meaning of the '<em>Lang Name</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Specifies the language in which the expression is stated
- * <!-- end-model-doc -->
- * @return the value of the '<em>Language</em>' attribute.
- * @see org.eclipse.gmf.codegen.gmfgen.GenLanguage
- * @see #setLanguage(GenLanguage)
- * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getValueExpression_Language()
- * @model default="ocl" required="true"
- * @generated
- */
- GenLanguage getLanguage();
-
- /**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.ValueExpression#getLanguage <em>Language</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Language</em>' attribute.
- * @see org.eclipse.gmf.codegen.gmfgen.GenLanguage
- * @see #getLanguage()
+ * @return the value of the '<em>Lang Name</em>' attribute.
+ * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getValueExpression_LangName()
+ * @model transient="true" changeable="false" volatile="true" derived="true"
+ * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='lang'"
* @generated
*/
- void setLanguage(GenLanguage value);
+ String getLangName();
/**
- * Returns the value of the '<em><b>Lang Name</b></em>' attribute.
+ * Returns the value of the '<em><b>Provider</b></em>' container reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase#getExpressions <em>Expressions</em>}'.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Lang Name</em>' attribute isn't clear,
+ * If the meaning of the '<em>Provider</em>' container reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Lang Name</em>' attribute.
- * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getValueExpression_LangName()
- * @model transient="true" changeable="false" volatile="true" derived="true"
- * annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='lang'"
+ * @return the value of the '<em>Provider</em>' container reference.
+ * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getValueExpression_Provider()
+ * @see org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase#getExpressions
+ * @model opposite="expressions" resolveProxies="false" required="true" transient="false" changeable="false"
* @generated
*/
- String getLangName();
+ GenExpressionProviderBase getProvider();
/**
* <!-- begin-user-doc -->
@@ -120,7 +104,4 @@ public interface ValueExpression extends EObject {
* @generated
*/
String getBodyString();
-
- boolean isOCLExpression();
-
} // ValueExpression
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
index 8fec2416e..8df86c278 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
@@ -31,7 +31,7 @@ public class GMFGenFactoryImpl extends EFactoryImpl implements GMFGenFactory {
*/
public static GMFGenFactory init() {
try {
- GMFGenFactory theGMFGenFactory = (GMFGenFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/2006/GenModel");
+ GMFGenFactory theGMFGenFactory = (GMFGenFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/2008/GenModel");
if (theGMFGenFactory != null) {
return theGMFGenFactory;
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
index ca3f421df..97d026aba 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
@@ -3938,7 +3938,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getValueExpression_Language() {
+ public EAttribute getValueExpression_LangName() {
return (EAttribute)valueExpressionEClass.getEStructuralFeatures().get(1);
}
@@ -3947,8 +3947,8 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getValueExpression_LangName() {
- return (EAttribute)valueExpressionEClass.getEStructuralFeatures().get(2);
+ public EReference getValueExpression_Provider() {
+ return (EReference)valueExpressionEClass.getEStructuralFeatures().get(2);
}
/**
@@ -4307,6 +4307,15 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getGenFeatureValueSpec_Value() {
+ return (EReference)genFeatureValueSpecEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getGenReferenceNewElementSpec() {
return genReferenceNewElementSpecEClass;
}
@@ -6425,8 +6434,8 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
valueExpressionEClass = createEClass(VALUE_EXPRESSION);
createEAttribute(valueExpressionEClass, VALUE_EXPRESSION__BODY);
- createEAttribute(valueExpressionEClass, VALUE_EXPRESSION__LANGUAGE);
createEAttribute(valueExpressionEClass, VALUE_EXPRESSION__LANG_NAME);
+ createEReference(valueExpressionEClass, VALUE_EXPRESSION__PROVIDER);
genConstraintEClass = createEClass(GEN_CONSTRAINT);
@@ -6478,6 +6487,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
createEReference(genFeatureSeqInitializerEClass, GEN_FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER);
genFeatureValueSpecEClass = createEClass(GEN_FEATURE_VALUE_SPEC);
+ createEReference(genFeatureValueSpecEClass, GEN_FEATURE_VALUE_SPEC__VALUE);
genReferenceNewElementSpecEClass = createEClass(GEN_REFERENCE_NEW_ELEMENT_SPEC);
createEReference(genReferenceNewElementSpecEClass, GEN_REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS);
@@ -6806,7 +6816,6 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
toolGroupEClass.getESuperTypes().add(this.getEntryBase());
toolGroupEClass.getESuperTypes().add(this.getToolGroupItem());
genFeatureSeqInitializerEClass.getESuperTypes().add(this.getGenElementInitializer());
- genFeatureValueSpecEClass.getESuperTypes().add(this.getValueExpression());
genFeatureValueSpecEClass.getESuperTypes().add(this.getGenFeatureInitializer());
genReferenceNewElementSpecEClass.getESuperTypes().add(this.getGenFeatureInitializer());
genAuditRuleEClass.getESuperTypes().add(this.getGenRuleBase());
@@ -7333,7 +7342,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEReference(getTypeModelFacet_MetaClass(), theGenModelPackage.getGenClass(), null, "metaClass", null, 1, 1, TypeModelFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getTypeModelFacet_ContainmentMetaFeature(), theGenModelPackage.getGenFeature(), null, "containmentMetaFeature", null, 0, 1, TypeModelFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getTypeModelFacet_ChildMetaFeature(), theGenModelPackage.getGenFeature(), null, "childMetaFeature", null, 0, 1, TypeModelFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getTypeModelFacet_ModelElementSelector(), this.getGenConstraint(), null, "modelElementSelector", null, 0, 1, TypeModelFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTypeModelFacet_ModelElementSelector(), this.getGenConstraint(), null, "modelElementSelector", null, 0, 1, TypeModelFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getTypeModelFacet_ModelElementInitializer(), this.getGenElementInitializer(), null, "modelElementInitializer", null, 0, 1, TypeModelFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(typeModelFacetEClass, ecorePackage.getEBoolean(), "isPhantomElement", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -7405,8 +7414,8 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEClass(valueExpressionEClass, ValueExpression.class, "ValueExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getValueExpression_Body(), ecorePackage.getEString(), "body", null, 1, 1, ValueExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getValueExpression_Language(), this.getGenLanguage(), "language", "ocl", 1, 1, ValueExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getValueExpression_LangName(), ecorePackage.getEString(), "langName", null, 0, 1, ValueExpression.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEReference(getValueExpression_Provider(), this.getGenExpressionProviderBase(), this.getGenExpressionProviderBase_Expressions(), "provider", null, 1, 1, ValueExpression.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(valueExpressionEClass, ecorePackage.getEString(), "getBodyString", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -7464,6 +7473,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEReference(getGenFeatureSeqInitializer_CreatingInitializer(), this.getGenReferenceNewElementSpec(), this.getGenReferenceNewElementSpec_NewElementInitializers(), "creatingInitializer", null, 0, 1, GenFeatureSeqInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(genFeatureValueSpecEClass, GenFeatureValueSpec.class, "GenFeatureValueSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getGenFeatureValueSpec_Value(), this.getValueExpression(), null, "value", null, 1, 1, GenFeatureValueSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(genReferenceNewElementSpecEClass, GenReferenceNewElementSpec.class, "GenReferenceNewElementSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getGenReferenceNewElementSpec_NewElementInitializers(), this.getGenFeatureSeqInitializer(), this.getGenFeatureSeqInitializer_CreatingInitializer(), "newElementInitializers", null, 1, -1, GenReferenceNewElementSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -7474,8 +7484,8 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEClass(genLinkConstraintsEClass, GenLinkConstraints.class, "GenLinkConstraints", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getGenLinkConstraints_Link(), this.getGenLink(), this.getGenLink_CreationConstraints(), "link", null, 1, 1, GenLinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getGenLinkConstraints_SourceEnd(), this.getGenConstraint(), null, "sourceEnd", null, 0, 1, GenLinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getGenLinkConstraints_TargetEnd(), this.getGenConstraint(), null, "targetEnd", null, 0, 1, GenLinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getGenLinkConstraints_SourceEnd(), this.getGenConstraint(), null, "sourceEnd", null, 0, 1, GenLinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getGenLinkConstraints_TargetEnd(), this.getGenConstraint(), null, "targetEnd", null, 0, 1, GenLinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(genLinkConstraintsEClass, theGenModelPackage.getGenClass(), "getLinkClass", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -7508,7 +7518,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEClass(genAuditRuleEClass, GenAuditRule.class, "GenAuditRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getGenAuditRule_Root(), this.getGenAuditRoot(), this.getGenAuditRoot_Rules(), "root", null, 1, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGenAuditRule_Id(), ecorePackage.getEString(), "id", null, 1, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getGenAuditRule_Rule(), this.getGenConstraint(), null, "rule", null, 1, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getGenAuditRule_Rule(), this.getGenConstraint(), null, "rule", null, 1, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenAuditRule_Target(), this.getGenAuditable(), null, "target", null, 1, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGenAuditRule_Message(), ecorePackage.getEString(), "message", null, 0, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGenAuditRule_Severity(), this.getGenSeverity(), "severity", "ERROR", 0, 1, GenAuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -7543,7 +7553,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEClass(genMetricRuleEClass, GenMetricRule.class, "GenMetricRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getGenMetricRule_Key(), ecorePackage.getEString(), "key", null, 1, 1, GenMetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getGenMetricRule_Rule(), this.getValueExpression(), null, "rule", null, 1, 1, GenMetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getGenMetricRule_Rule(), this.getValueExpression(), null, "rule", null, 1, 1, GenMetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenMetricRule_Target(), this.getGenMeasurable(), null, "target", null, 1, 1, GenMetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGenMetricRule_LowLimit(), ecorePackage.getEDoubleObject(), "lowLimit", null, 0, 1, GenMetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getGenMetricRule_HighLimit(), ecorePackage.getEDoubleObject(), "highLimit", null, 0, 1, GenMetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -7576,13 +7586,10 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
initEReference(getGenExpressionProviderContainer_Providers(), this.getGenExpressionProviderBase(), this.getGenExpressionProviderBase_Container(), "providers", null, 0, -1, GenExpressionProviderContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenExpressionProviderContainer_EditorGen(), this.getGenEditorGenerator(), this.getGenEditorGenerator_ExpressionProviders(), "editorGen", null, 1, 1, GenExpressionProviderContainer.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- op = addEOperation(genExpressionProviderContainerEClass, this.getGenExpressionProviderBase(), "getProvider", 0, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, this.getValueExpression(), "expression", 1, 1, IS_UNIQUE, IS_ORDERED);
-
addEOperation(genExpressionProviderContainerEClass, ecorePackage.getEString(), "getAbstractExpressionQualifiedClassName", 1, 1, IS_UNIQUE, IS_ORDERED);
initEClass(genExpressionProviderBaseEClass, GenExpressionProviderBase.class, "GenExpressionProviderBase", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getGenExpressionProviderBase_Expressions(), this.getValueExpression(), null, "expressions", null, 0, -1, GenExpressionProviderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getGenExpressionProviderBase_Expressions(), this.getValueExpression(), this.getValueExpression_Provider(), "expressions", null, 1, -1, GenExpressionProviderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getGenExpressionProviderBase_Container(), this.getGenExpressionProviderContainer(), this.getGenExpressionProviderContainer_Providers(), "container", null, 1, 1, GenExpressionProviderBase.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(genExpressionProviderBaseEClass, this.getGenLanguage(), "getLanguage", 1, 1, IS_UNIQUE, IS_ORDERED);
@@ -7920,7 +7927,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
"constraints", "http://www.eclipse.org/gmf/2005/constraints",
"meta", "http://www.eclipse.org/gmf/2005/constraints/meta",
"deprecated", "http://www.eclipse.org/gmf/2006/deprecated"
- });
+ });
}
/**
@@ -8062,7 +8069,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
new String[] {
"ocl", "metaFeature.ecoreFeature.unique",
"description", "All references are unique in EMF due to the current code generation"
- });
+ });
addAnnotation
(getGenFeatureSeqInitializer_ElementClass(),
source,
@@ -8076,7 +8083,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
new String[] {
"ocl", "not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.ecoreClass.interface or elementClass.ecoreClass.abstract)",
"description", "\'elementClass\' must be a concrete EClass which is the same or sub-type of the containing \'GenReferenceNewElementSpec\' reference type"
- });
+ });
addAnnotation
(genReferenceNewElementSpecEClass,
source,
@@ -8169,7 +8176,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
source,
new String[] {
"documentation", "LinkCreationConstants should be generated if diagram has any links"
- });
+ });
}
/**
@@ -8198,7 +8205,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
source,
new String[] {
"def", "body"
- });
+ });
addAnnotation
(getValueExpression_LangName(),
source,
@@ -8219,17 +8226,11 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
"ocl", "self.elementClass"
});
addAnnotation
- (genFeatureValueSpecEClass,
+ (getGenFeatureValueSpec_Value(),
source,
new String[] {
- "def", "ValueSpec"
- });
- addAnnotation
- (genFeatureValueSpecEClass,
- source,
- new String[] {
- "def", "type",
- "ocl", "feature.ecoreFeature"
+ "def", "context",
+ "ocl", "featureSeqInitializer.elementClass"
});
addAnnotation
(getGenLinkConstraints_SourceEnd(),
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenAuditRuleImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenAuditRuleImpl.java
index 9502213ca..8068ed0ab 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenAuditRuleImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenAuditRuleImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.gmf.codegen.gmfgen.GenAuditable;
import org.eclipse.gmf.codegen.gmfgen.GenConstraint;
import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
import org.eclipse.gmf.codegen.gmfgen.GenDomainAttributeTarget;
+import org.eclipse.gmf.codegen.gmfgen.GenLanguage;
import org.eclipse.gmf.codegen.gmfgen.GenSeverity;
/**
@@ -64,7 +65,7 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
protected String id = ID_EDEFAULT;
/**
- * The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
+ * The cached value of the '{@link #getRule() <em>Rule</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getRule()
@@ -283,6 +284,14 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
* @generated
*/
public GenConstraint getRule() {
+ if (rule != null && rule.eIsProxy()) {
+ InternalEObject oldRule = (InternalEObject)rule;
+ rule = (GenConstraint)eResolveProxy(oldRule);
+ if (rule != oldRule) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.GEN_AUDIT_RULE__RULE, oldRule, rule));
+ }
+ }
return rule;
}
@@ -291,14 +300,8 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRule(GenConstraint newRule, NotificationChain msgs) {
- GenConstraint oldRule = rule;
- rule = newRule;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_AUDIT_RULE__RULE, oldRule, newRule);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
+ public GenConstraint basicGetRule() {
+ return rule;
}
/**
@@ -307,17 +310,10 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
* @generated
*/
public void setRule(GenConstraint newRule) {
- if (newRule != rule) {
- NotificationChain msgs = null;
- if (rule != null)
- msgs = ((InternalEObject)rule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_AUDIT_RULE__RULE, null, msgs);
- if (newRule != null)
- msgs = ((InternalEObject)newRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_AUDIT_RULE__RULE, null, msgs);
- msgs = basicSetRule(newRule, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_AUDIT_RULE__RULE, newRule, newRule));
+ GenConstraint oldRule = rule;
+ rule = newRule;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_AUDIT_RULE__RULE, oldRule, rule));
}
/**
@@ -409,7 +405,7 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
*/
public boolean isRequiresConstraintAdapter() {
if(getRule() != null) {
- if(!getRule().isOCLExpression() || getTarget() instanceof GenDomainAttributeTarget) {
+ if(getRule().getProvider().getLanguage() != GenLanguage.OCL_LITERAL || getTarget() instanceof GenDomainAttributeTarget) {
return true;
} else if(getTarget() != null && getTarget().getContext() != null) {
return getTarget().getContext() != getTarget().getTargetClass();
@@ -508,8 +504,6 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
switch (featureID) {
case GMFGenPackage.GEN_AUDIT_RULE__ROOT:
return eBasicSetContainer(null, GMFGenPackage.GEN_AUDIT_RULE__ROOT, msgs);
- case GMFGenPackage.GEN_AUDIT_RULE__RULE:
- return basicSetRule(null, msgs);
case GMFGenPackage.GEN_AUDIT_RULE__TARGET:
return basicSetTarget(null, msgs);
case GMFGenPackage.GEN_AUDIT_RULE__CATEGORY:
@@ -545,7 +539,8 @@ public class GenAuditRuleImpl extends GenRuleBaseImpl implements GenAuditRule {
case GMFGenPackage.GEN_AUDIT_RULE__ID:
return getId();
case GMFGenPackage.GEN_AUDIT_RULE__RULE:
- return getRule();
+ if (resolve) return getRule();
+ return basicGetRule();
case GMFGenPackage.GEN_AUDIT_RULE__TARGET:
return getTarget();
case GMFGenPackage.GEN_AUDIT_RULE__MESSAGE:
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderBaseImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderBaseImpl.java
index 4764e63bc..1102f5616 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderBaseImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderBaseImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GenExpressionProviderBaseImpl.java,v 1.12 2008/04/18 14:43:22 atikhomirov Exp $
+ * $Id: GenExpressionProviderBaseImpl.java,v 1.13 2008/05/07 13:56:01 atikhomirov Exp $
*/
package org.eclipse.gmf.codegen.gmfgen.impl;
@@ -13,7 +13,8 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase;
import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderContainer;
@@ -36,7 +37,7 @@ import org.eclipse.gmf.codegen.gmfgen.ValueExpression;
*/
public abstract class GenExpressionProviderBaseImpl extends EObjectImpl implements GenExpressionProviderBase {
/**
- * The cached value of the '{@link #getExpressions() <em>Expressions</em>}' reference list.
+ * The cached value of the '{@link #getExpressions() <em>Expressions</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getExpressions()
@@ -78,7 +79,7 @@ public abstract class GenExpressionProviderBaseImpl extends EObjectImpl implemen
*/
public EList<ValueExpression> getExpressions() {
if (expressions == null) {
- expressions = new EObjectResolvingEList<ValueExpression>(ValueExpression.class, this, GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__EXPRESSIONS);
+ expressions = new EObjectContainmentWithInverseEList<ValueExpression>(ValueExpression.class, this, GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__EXPRESSIONS, GMFGenPackage.VALUE_EXPRESSION__PROVIDER);
}
return expressions;
}
@@ -98,9 +99,12 @@ public abstract class GenExpressionProviderBaseImpl extends EObjectImpl implemen
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
+ case GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__EXPRESSIONS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getExpressions()).basicAdd(otherEnd, msgs);
case GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__CONTAINER:
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
@@ -117,6 +121,8 @@ public abstract class GenExpressionProviderBaseImpl extends EObjectImpl implemen
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
+ case GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__EXPRESSIONS:
+ return ((InternalEList<?>)getExpressions()).basicRemove(otherEnd, msgs);
case GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__CONTAINER:
return eBasicSetContainer(null, GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__CONTAINER, msgs);
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderContainerImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderContainerImpl.java
index e613db554..2987860d0 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderContainerImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenExpressionProviderContainerImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GenExpressionProviderContainerImpl.java,v 1.8 2008/05/05 21:06:41 atikhomirov Exp $
+ * $Id: GenExpressionProviderContainerImpl.java,v 1.9 2008/05/07 13:56:01 atikhomirov Exp $
*/
package org.eclipse.gmf.codegen.gmfgen.impl;
@@ -21,7 +21,6 @@ import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase;
import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderContainer;
-import org.eclipse.gmf.codegen.gmfgen.ValueExpression;
/**
* <!-- begin-user-doc -->
@@ -206,29 +205,6 @@ public class GenExpressionProviderContainerImpl extends EObjectImpl implements G
* <!-- end-user-doc -->
* @generated NOT
*/
- public GenExpressionProviderBase getProvider(ValueExpression expression) {
- for (GenExpressionProviderBase nextProvider : getProviders()) {
- if(nextProvider.getExpressions().contains(expression)) {
- return nextProvider;
- }
- }
- // Note: lookup by expression language is performed in order to handle multiple
- // copies of expression coming from single node mapping reuse as only a single instance
- // of ValueExpression is included in the 'expressions' feature.
- for (GenExpressionProviderBase nextProvider : getProviders()) {
- if(expression != null && expression.getLanguage() != null &&
- expression.getLanguage().equals(nextProvider.getLanguage())) {
- return nextProvider;
- }
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
public String getAbstractExpressionQualifiedClassName() {
return getExpressionsPackageName() + "." + getAbstractExpressionClassName(); //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenFeatureValueSpecImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenFeatureValueSpecImpl.java
index ac88f9d28..08519c823 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenFeatureValueSpecImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenFeatureValueSpecImpl.java
@@ -12,10 +12,11 @@ import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.gmf.codegen.gmfgen.GenFeatureInitializer;
import org.eclipse.gmf.codegen.gmfgen.GenFeatureSeqInitializer;
import org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec;
+import org.eclipse.gmf.codegen.gmfgen.ValueExpression;
/**
* <!-- begin-user-doc -->
@@ -26,12 +27,13 @@ import org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec;
* <ul>
* <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.GenFeatureValueSpecImpl#getFeature <em>Feature</em>}</li>
* <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.GenFeatureValueSpecImpl#getFeatureSeqInitializer <em>Feature Seq Initializer</em>}</li>
+ * <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.GenFeatureValueSpecImpl#getValue <em>Value</em>}</li>
* </ul>
* </p>
*
* @generated
*/
-public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenFeatureValueSpec {
+public class GenFeatureValueSpecImpl extends EObjectImpl implements GenFeatureValueSpec {
/**
* The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.
* <!-- begin-user-doc -->
@@ -43,6 +45,16 @@ public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenF
protected GenFeature feature;
/**
+ * The cached value of the '{@link #getValue() <em>Value</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected ValueExpression value;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -114,6 +126,44 @@ public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenF
* <!-- end-user-doc -->
* @generated
*/
+ public ValueExpression getValue() {
+ if (value != null && value.eIsProxy()) {
+ InternalEObject oldValue = (InternalEObject)value;
+ value = (ValueExpression)eResolveProxy(oldValue);
+ if (value != oldValue) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.GEN_FEATURE_VALUE_SPEC__VALUE, oldValue, value));
+ }
+ }
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ValueExpression basicGetValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setValue(ValueExpression newValue) {
+ ValueExpression oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_FEATURE_VALUE_SPEC__VALUE, oldValue, value));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
@@ -166,6 +216,9 @@ public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenF
return basicGetFeature();
case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER:
return getFeatureSeqInitializer();
+ case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__VALUE:
+ if (resolve) return getValue();
+ return basicGetValue();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -181,6 +234,9 @@ public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenF
case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE:
setFeature((GenFeature)newValue);
return;
+ case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__VALUE:
+ setValue((ValueExpression)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -196,6 +252,9 @@ public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenF
case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE:
setFeature((GenFeature)null);
return;
+ case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__VALUE:
+ setValue((ValueExpression)null);
+ return;
}
super.eUnset(featureID);
}
@@ -212,42 +271,10 @@ public class GenFeatureValueSpecImpl extends ValueExpressionImpl implements GenF
return feature != null;
case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER:
return getFeatureSeqInitializer() != null;
+ case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__VALUE:
+ return value != null;
}
return super.eIsSet(featureID);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
- if (baseClass == GenFeatureInitializer.class) {
- switch (derivedFeatureID) {
- case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE: return GMFGenPackage.GEN_FEATURE_INITIALIZER__FEATURE;
- case GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER: return GMFGenPackage.GEN_FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER;
- default: return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
- if (baseClass == GenFeatureInitializer.class) {
- switch (baseFeatureID) {
- case GMFGenPackage.GEN_FEATURE_INITIALIZER__FEATURE: return GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE;
- case GMFGenPackage.GEN_FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER: return GMFGenPackage.GEN_FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER;
- default: return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
-
} //GenFeatureValueSpecImpl
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenLinkConstraintsImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenLinkConstraintsImpl.java
index 88c17d9e1..94c47de06 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenLinkConstraintsImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenLinkConstraintsImpl.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.codegen.gmfgen.TypeLinkModelFacet;
*/
public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstraints {
/**
- * The cached value of the '{@link #getSourceEnd() <em>Source End</em>}' containment reference.
+ * The cached value of the '{@link #getSourceEnd() <em>Source End</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getSourceEnd()
@@ -50,7 +50,7 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
protected GenConstraint sourceEnd;
/**
- * The cached value of the '{@link #getTargetEnd() <em>Target End</em>}' containment reference.
+ * The cached value of the '{@link #getTargetEnd() <em>Target End</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getTargetEnd()
@@ -125,6 +125,14 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
* @generated
*/
public GenConstraint getSourceEnd() {
+ if (sourceEnd != null && sourceEnd.eIsProxy()) {
+ InternalEObject oldSourceEnd = (InternalEObject)sourceEnd;
+ sourceEnd = (GenConstraint)eResolveProxy(oldSourceEnd);
+ if (sourceEnd != oldSourceEnd) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END, oldSourceEnd, sourceEnd));
+ }
+ }
return sourceEnd;
}
@@ -133,14 +141,8 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetSourceEnd(GenConstraint newSourceEnd, NotificationChain msgs) {
- GenConstraint oldSourceEnd = sourceEnd;
- sourceEnd = newSourceEnd;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END, oldSourceEnd, newSourceEnd);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
+ public GenConstraint basicGetSourceEnd() {
+ return sourceEnd;
}
/**
@@ -149,17 +151,10 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
* @generated
*/
public void setSourceEnd(GenConstraint newSourceEnd) {
- if (newSourceEnd != sourceEnd) {
- NotificationChain msgs = null;
- if (sourceEnd != null)
- msgs = ((InternalEObject)sourceEnd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END, null, msgs);
- if (newSourceEnd != null)
- msgs = ((InternalEObject)newSourceEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END, null, msgs);
- msgs = basicSetSourceEnd(newSourceEnd, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END, newSourceEnd, newSourceEnd));
+ GenConstraint oldSourceEnd = sourceEnd;
+ sourceEnd = newSourceEnd;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END, oldSourceEnd, sourceEnd));
}
/**
@@ -168,6 +163,14 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
* @generated
*/
public GenConstraint getTargetEnd() {
+ if (targetEnd != null && targetEnd.eIsProxy()) {
+ InternalEObject oldTargetEnd = (InternalEObject)targetEnd;
+ targetEnd = (GenConstraint)eResolveProxy(oldTargetEnd);
+ if (targetEnd != oldTargetEnd) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END, oldTargetEnd, targetEnd));
+ }
+ }
return targetEnd;
}
@@ -176,14 +179,8 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetTargetEnd(GenConstraint newTargetEnd, NotificationChain msgs) {
- GenConstraint oldTargetEnd = targetEnd;
- targetEnd = newTargetEnd;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END, oldTargetEnd, newTargetEnd);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
+ public GenConstraint basicGetTargetEnd() {
+ return targetEnd;
}
/**
@@ -192,17 +189,10 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
* @generated
*/
public void setTargetEnd(GenConstraint newTargetEnd) {
- if (newTargetEnd != targetEnd) {
- NotificationChain msgs = null;
- if (targetEnd != null)
- msgs = ((InternalEObject)targetEnd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END, null, msgs);
- if (newTargetEnd != null)
- msgs = ((InternalEObject)newTargetEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END, null, msgs);
- msgs = basicSetTargetEnd(newTargetEnd, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END, newTargetEnd, newTargetEnd));
+ GenConstraint oldTargetEnd = targetEnd;
+ targetEnd = newTargetEnd;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END, oldTargetEnd, targetEnd));
}
/**
@@ -309,10 +299,6 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
switch (featureID) {
case GMFGenPackage.GEN_LINK_CONSTRAINTS__LINK:
return basicSetLink(null, msgs);
- case GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END:
- return basicSetSourceEnd(null, msgs);
- case GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END:
- return basicSetTargetEnd(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -342,9 +328,11 @@ public class GenLinkConstraintsImpl extends EObjectImpl implements GenLinkConstr
case GMFGenPackage.GEN_LINK_CONSTRAINTS__LINK:
return getLink();
case GMFGenPackage.GEN_LINK_CONSTRAINTS__SOURCE_END:
- return getSourceEnd();
+ if (resolve) return getSourceEnd();
+ return basicGetSourceEnd();
case GMFGenPackage.GEN_LINK_CONSTRAINTS__TARGET_END:
- return getTargetEnd();
+ if (resolve) return getTargetEnd();
+ return basicGetTargetEnd();
}
return super.eGet(featureID, resolve, coreType);
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenMetricRuleImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenMetricRuleImpl.java
index d8cf62868..5960d3382 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenMetricRuleImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenMetricRuleImpl.java
@@ -62,7 +62,7 @@ public class GenMetricRuleImpl extends GenRuleBaseImpl implements GenMetricRule
protected String key = KEY_EDEFAULT;
/**
- * The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
+ * The cached value of the '{@link #getRule() <em>Rule</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getRule()
@@ -167,6 +167,14 @@ public class GenMetricRuleImpl extends GenRuleBaseImpl implements GenMetricRule
* @generated
*/
public ValueExpression getRule() {
+ if (rule != null && rule.eIsProxy()) {
+ InternalEObject oldRule = (InternalEObject)rule;
+ rule = (ValueExpression)eResolveProxy(oldRule);
+ if (rule != oldRule) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.GEN_METRIC_RULE__RULE, oldRule, rule));
+ }
+ }
return rule;
}
@@ -175,14 +183,8 @@ public class GenMetricRuleImpl extends GenRuleBaseImpl implements GenMetricRule
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetRule(ValueExpression newRule, NotificationChain msgs) {
- ValueExpression oldRule = rule;
- rule = newRule;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_METRIC_RULE__RULE, oldRule, newRule);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
+ public ValueExpression basicGetRule() {
+ return rule;
}
/**
@@ -191,17 +193,10 @@ public class GenMetricRuleImpl extends GenRuleBaseImpl implements GenMetricRule
* @generated
*/
public void setRule(ValueExpression newRule) {
- if (newRule != rule) {
- NotificationChain msgs = null;
- if (rule != null)
- msgs = ((InternalEObject)rule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_METRIC_RULE__RULE, null, msgs);
- if (newRule != null)
- msgs = ((InternalEObject)newRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.GEN_METRIC_RULE__RULE, null, msgs);
- msgs = basicSetRule(newRule, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_METRIC_RULE__RULE, newRule, newRule));
+ ValueExpression oldRule = rule;
+ rule = newRule;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_METRIC_RULE__RULE, oldRule, rule));
}
/**
@@ -354,8 +349,6 @@ public class GenMetricRuleImpl extends GenRuleBaseImpl implements GenMetricRule
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case GMFGenPackage.GEN_METRIC_RULE__RULE:
- return basicSetRule(null, msgs);
case GMFGenPackage.GEN_METRIC_RULE__TARGET:
return basicSetTarget(null, msgs);
case GMFGenPackage.GEN_METRIC_RULE__CONTAINER:
@@ -389,7 +382,8 @@ public class GenMetricRuleImpl extends GenRuleBaseImpl implements GenMetricRule
case GMFGenPackage.GEN_METRIC_RULE__KEY:
return getKey();
case GMFGenPackage.GEN_METRIC_RULE__RULE:
- return getRule();
+ if (resolve) return getRule();
+ return basicGetRule();
case GMFGenPackage.GEN_METRIC_RULE__TARGET:
return getTarget();
case GMFGenPackage.GEN_METRIC_RULE__LOW_LIMIT:
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java
index 5a636d4fd..afb161177 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java
@@ -69,7 +69,7 @@ public class TypeModelFacetImpl extends EObjectImpl implements TypeModelFacet {
protected GenFeature childMetaFeature;
/**
- * The cached value of the '{@link #getModelElementSelector() <em>Model Element Selector</em>}' containment reference.
+ * The cached value of the '{@link #getModelElementSelector() <em>Model Element Selector</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getModelElementSelector()
@@ -235,6 +235,14 @@ public class TypeModelFacetImpl extends EObjectImpl implements TypeModelFacet {
* @generated
*/
public GenConstraint getModelElementSelector() {
+ if (modelElementSelector != null && modelElementSelector.eIsProxy()) {
+ InternalEObject oldModelElementSelector = (InternalEObject)modelElementSelector;
+ modelElementSelector = (GenConstraint)eResolveProxy(oldModelElementSelector);
+ if (modelElementSelector != oldModelElementSelector) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR, oldModelElementSelector, modelElementSelector));
+ }
+ }
return modelElementSelector;
}
@@ -243,14 +251,8 @@ public class TypeModelFacetImpl extends EObjectImpl implements TypeModelFacet {
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetModelElementSelector(GenConstraint newModelElementSelector, NotificationChain msgs) {
- GenConstraint oldModelElementSelector = modelElementSelector;
- modelElementSelector = newModelElementSelector;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR, oldModelElementSelector, newModelElementSelector);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
+ public GenConstraint basicGetModelElementSelector() {
+ return modelElementSelector;
}
/**
@@ -259,17 +261,10 @@ public class TypeModelFacetImpl extends EObjectImpl implements TypeModelFacet {
* @generated
*/
public void setModelElementSelector(GenConstraint newModelElementSelector) {
- if (newModelElementSelector != modelElementSelector) {
- NotificationChain msgs = null;
- if (modelElementSelector != null)
- msgs = ((InternalEObject)modelElementSelector).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR, null, msgs);
- if (newModelElementSelector != null)
- msgs = ((InternalEObject)newModelElementSelector).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR, null, msgs);
- msgs = basicSetModelElementSelector(newModelElementSelector, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR, newModelElementSelector, newModelElementSelector));
+ GenConstraint oldModelElementSelector = modelElementSelector;
+ modelElementSelector = newModelElementSelector;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR, oldModelElementSelector, modelElementSelector));
}
/**
@@ -332,8 +327,6 @@ public class TypeModelFacetImpl extends EObjectImpl implements TypeModelFacet {
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR:
- return basicSetModelElementSelector(null, msgs);
case GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_INITIALIZER:
return basicSetModelElementInitializer(null, msgs);
}
@@ -358,7 +351,8 @@ public class TypeModelFacetImpl extends EObjectImpl implements TypeModelFacet {
if (resolve) return getChildMetaFeature();
return basicGetChildMetaFeature();
case GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_SELECTOR:
- return getModelElementSelector();
+ if (resolve) return getModelElementSelector();
+ return basicGetModelElementSelector();
case GMFGenPackage.TYPE_MODEL_FACET__MODEL_ELEMENT_INITIALIZER:
return getModelElementInitializer();
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ValueExpressionImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ValueExpressionImpl.java
index 795b6967c..a55e6fcc7 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ValueExpressionImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ValueExpressionImpl.java
@@ -7,10 +7,13 @@
package org.eclipse.gmf.codegen.gmfgen.impl;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
+import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase;
import org.eclipse.gmf.codegen.gmfgen.GenLanguage;
import org.eclipse.gmf.codegen.gmfgen.ValueExpression;
import org.eclipse.gmf.internal.common.codegen.Conversions;
@@ -23,8 +26,8 @@ import org.eclipse.gmf.internal.common.codegen.Conversions;
* The following features are implemented:
* <ul>
* <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.ValueExpressionImpl#getBody <em>Body</em>}</li>
- * <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.ValueExpressionImpl#getLanguage <em>Language</em>}</li>
* <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.ValueExpressionImpl#getLangName <em>Lang Name</em>}</li>
+ * <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.ValueExpressionImpl#getProvider <em>Provider</em>}</li>
* </ul>
* </p>
*
@@ -52,26 +55,6 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
protected String body = BODY_EDEFAULT;
/**
- * The default value of the '{@link #getLanguage() <em>Language</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLanguage()
- * @generated
- * @ordered
- */
- protected static final GenLanguage LANGUAGE_EDEFAULT = GenLanguage.OCL_LITERAL;
-
- /**
- * The cached value of the '{@link #getLanguage() <em>Language</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLanguage()
- * @generated
- * @ordered
- */
- protected GenLanguage language = LANGUAGE_EDEFAULT;
-
- /**
* The default value of the '{@link #getLangName() <em>Lang Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -99,15 +82,6 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
protected EClass eStaticClass() {
return GMFGenPackage.eINSTANCE.getValueExpression();
}
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isOCLExpression() {
- return GenLanguage.OCL_LITERAL.equals(getLanguage());
- }
/**
* <!-- begin-user-doc -->
@@ -133,10 +107,11 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
- public GenLanguage getLanguage() {
- return language;
+ public String getLangName() {
+ GenLanguage langEnum = getProvider() == null ? null : getProvider().getLanguage();
+ return (langEnum != null) ? langEnum.getName() : ""; //$NON-NLS-1$
}
/**
@@ -144,11 +119,9 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
* <!-- end-user-doc -->
* @generated
*/
- public void setLanguage(GenLanguage newLanguage) {
- GenLanguage oldLanguage = language;
- language = newLanguage == null ? LANGUAGE_EDEFAULT : newLanguage;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.VALUE_EXPRESSION__LANGUAGE, oldLanguage, language));
+ public GenExpressionProviderBase getProvider() {
+ if (eContainerFeatureID != GMFGenPackage.VALUE_EXPRESSION__PROVIDER) return null;
+ return (GenExpressionProviderBase)eContainer();
}
/**
@@ -156,18 +129,52 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
* <!-- end-user-doc -->
* @generated NOT
*/
- public String getLangName() {
- GenLanguage langEnum = getLanguage();
- return (langEnum != null) ? langEnum.getName() : ""; //$NON-NLS-1$
+ public String getBodyString() {
+ return Conversions.toStringLiteral(getBody());
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated NOT
+ * @generated
*/
- public String getBodyString() {
- return Conversions.toStringLiteral(getBody());
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGenPackage.VALUE_EXPRESSION__PROVIDER:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return eBasicSetContainer(otherEnd, GMFGenPackage.VALUE_EXPRESSION__PROVIDER, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case GMFGenPackage.VALUE_EXPRESSION__PROVIDER:
+ return eBasicSetContainer(null, GMFGenPackage.VALUE_EXPRESSION__PROVIDER, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+ switch (eContainerFeatureID) {
+ case GMFGenPackage.VALUE_EXPRESSION__PROVIDER:
+ return eInternalContainer().eInverseRemove(this, GMFGenPackage.GEN_EXPRESSION_PROVIDER_BASE__EXPRESSIONS, GenExpressionProviderBase.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
}
/**
@@ -180,10 +187,10 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
switch (featureID) {
case GMFGenPackage.VALUE_EXPRESSION__BODY:
return getBody();
- case GMFGenPackage.VALUE_EXPRESSION__LANGUAGE:
- return getLanguage();
case GMFGenPackage.VALUE_EXPRESSION__LANG_NAME:
return getLangName();
+ case GMFGenPackage.VALUE_EXPRESSION__PROVIDER:
+ return getProvider();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -199,9 +206,6 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
case GMFGenPackage.VALUE_EXPRESSION__BODY:
setBody((String)newValue);
return;
- case GMFGenPackage.VALUE_EXPRESSION__LANGUAGE:
- setLanguage((GenLanguage)newValue);
- return;
}
super.eSet(featureID, newValue);
}
@@ -217,9 +221,6 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
case GMFGenPackage.VALUE_EXPRESSION__BODY:
setBody(BODY_EDEFAULT);
return;
- case GMFGenPackage.VALUE_EXPRESSION__LANGUAGE:
- setLanguage(LANGUAGE_EDEFAULT);
- return;
}
super.eUnset(featureID);
}
@@ -234,10 +235,10 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
switch (featureID) {
case GMFGenPackage.VALUE_EXPRESSION__BODY:
return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
- case GMFGenPackage.VALUE_EXPRESSION__LANGUAGE:
- return language != LANGUAGE_EDEFAULT;
case GMFGenPackage.VALUE_EXPRESSION__LANG_NAME:
return LANG_NAME_EDEFAULT == null ? getLangName() != null : !LANG_NAME_EDEFAULT.equals(getLangName());
+ case GMFGenPackage.VALUE_EXPRESSION__PROVIDER:
+ return getProvider() != null;
}
return super.eIsSet(featureID);
}
@@ -254,8 +255,6 @@ public class ValueExpressionImpl extends EObjectImpl implements ValueExpression
StringBuffer result = new StringBuffer(super.toString());
result.append(" (body: ");
result.append(body);
- result.append(", language: ");
- result.append(language);
result.append(')');
return result.toString();
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java
index 1a5f57214..72dfa2f3f 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java
@@ -643,7 +643,6 @@ public class GMFGenSwitch<T> {
case GMFGenPackage.GEN_FEATURE_VALUE_SPEC: {
GenFeatureValueSpec genFeatureValueSpec = (GenFeatureValueSpec)theEObject;
T result = caseGenFeatureValueSpec(genFeatureValueSpec);
- if (result == null) result = caseValueExpression(genFeatureValueSpec);
if (result == null) result = caseGenFeatureInitializer(genFeatureValueSpec);
if (result == null) result = defaultCase(theEObject);
return result;
diff --git a/plugins/org.eclipse.gmf.codegen/templates-dynmodel/Facility.xpt b/plugins/org.eclipse.gmf.codegen/templates-dynmodel/Facility.xpt
index b8b5ada7c..e3c85a30b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates-dynmodel/Facility.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates-dynmodel/Facility.xpt
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates-dynmodel/MetaModel.xpt b/plugins/org.eclipse.gmf.codegen/templates-dynmodel/MetaModel.xpt
index 81fe85c49..df775bce3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates-dynmodel/MetaModel.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates-dynmodel/MetaModel.xpt
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/MetaModel.xpt b/plugins/org.eclipse.gmf.codegen/templates/MetaModel.xpt
index b6bfe38e7..b42ee8d60 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/MetaModel.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/MetaModel.xpt
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt
index 57d28636a..fe51b1976 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE Main FOR gmfgen::GenChildLabelNode-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt
index 889483c37..e7faabf18 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::editparts::Utils»
«DEFINE Main FOR gmfgen::GenCompartment-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt
index 5635a2b3c..a3a9eaeb9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE Main FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt
index c53659f2e..5ffa738ee 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE Main FOR gmfgen::GenExternalNodeLabel-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt
index 3bb9a95a7..37bb68691 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE Main FOR gmfgen::GenLink-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt
index 8d600cd55..8f2fae866 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE Main FOR gmfgen::GenLinkLabel-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt
index 532217aeb..99d24f2b7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE Main FOR gmfgen::GenNode-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt
index 174212b11..b76295f4b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::editparts::Utils»
«DEFINE Main FOR gmfgen::GenNodeLabel-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt
index 400fcc835..9f2df12b7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE contsructor FOR gmfgen::GenChildLabelNode-»
«EXPAND xpt::Common::generatedMemberComment»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
index 2b227d987..637b5e4c8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::editparts::Utils»
«DEFINE contsructor FOR gmfgen::GenCompartment-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt
index 4b3473775..d0363138e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editparts::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt
index 36a7667c7..c8e1c0eb7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE initializer FOR gmfgen::GenExternalNodeLabel-»
«EXPAND xpt::Common::generatedMemberComment»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
index e0fe95225..b4bcf2ee0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE constructor FOR gmfgen::GenLink-»
«EXPAND xpt::Common::generatedMemberComment»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt
index 353015c9b..46edc8fff 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«DEFINE initializer FOR gmfgen::GenLinkLabel-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
index a2ea8e070..ba9b8c97f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«EXTENSION xpt::diagram::editparts::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt
index dc4b5460c..519e2e84b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::editparts::Utils»
«DEFINE constructor FOR gmfgen::GenNodeLabel-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
index 72068789b..d4c63f1f7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
@@ -11,7 +11,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
index 388613e24..46ecace40 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
index edc4ec692..2f97fa443 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::GenAuditRoot»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
index 5f3177017..b6296b715 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::ExternalizerUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext
index 4a9b8b918..65ef19431 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
String getExternalizerPackageName(gmfgen::GenEditorGenerator generator) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext
index 6bda54425..c6ed1c58f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext
index c93a48e24..65f471e08 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
// FIXME remove java-only GenEditorGenerator#hasAudits or declare it in metamodel
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
index 0893bde96..9ac26bd95 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::application::i18n»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
index 1dc2c9ab8..4728c6646 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE Application FOR gmfgen::GenApplication-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
index cc432667f..7511f8b47 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE Perspective FOR gmfgen::GenApplication-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
index 864e1d6e5..77669d263 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::application::i18n»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
index a7af513d7..a538731c1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE WorkbenchAdvisor FOR gmfgen::GenApplication-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
index ee75935ab..ce4242bd3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::application::i18n»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
index 63d0586ce..a4aedbd3f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenApplication-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext
index 8efb96f73..a9d218405 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
String i18nKeyForDefaultFileEditorErrorDialog(gmfgen::GenApplication app) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext
index 71f1eb4dd..9929f1954 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext
index 5e0566531..386f313c8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
Boolean isStoringChildPositions(gmfgen::ViewmapLayoutType layoutType) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
index 888cb3826..51fa4274a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
index 73f9256e9..864c876d3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt
index 34578018e..518041f40 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
index 641763ca4..defdd97e6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt
index b27b68bb2..fac3c9eb4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE CreateShortcutDecorationsCommand FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
index a1f444c2b..9a6981913 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
index cebdfa307..0526b5ac8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt
index 556e7b17a..f7781c337 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE ReorientLinkViewCommand FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
index b7ee97f03..626facb50 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt
index cc42be9e4..f0317ad9a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE BaseEditHelper FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt
index 33b892a62..fd947a13b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE EditHelper FOR gmfgen::MetamodelType-»
«EXPAND xpt::Common::copyright FOR diagramElement.getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt
index 53ef72546..7179afdd2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE EditHelperAdvice FOR gmfgen::SpecializationType-»
«EXPAND xpt::Common::copyright FOR diagramElement.getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
index bbcdde584..85e5ea2c0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE visualIDConstant FOR gmfgen::GenCommonBase-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
index 975336281..195f69a08 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE EditPartFactory FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext
index 75408d44f..fe327d547 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
Boolean isStoringChildPositions(gmfgen::GenNode node) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt
index 0db14cb68..3cf1bfbe7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
@@ -367,10 +367,10 @@ public static boolean canCreate«getUniqueIdentifier()»(«EXPAND canCreateParamete
«IF creationConstraints != null && creationConstraints.isValid() && null != getDiagram().editorGen.expressionProviders-»
try {
«IF null != creationConstraints.sourceEnd-»
- «EXPAND checkAdditionalConstraint(creationConstraints.sourceEnd, sourceConstraintFieldName(this), "source", "target", creationConstraints.getSourceEndContextClass(), creationConstraints.getTargetEndContextClass()) FOR getDiagram().editorGen.expressionProviders.getProvider(creationConstraints.sourceEnd)-»
+ «EXPAND checkAdditionalConstraint(creationConstraints.sourceEnd, sourceConstraintFieldName(this), "source", "target", creationConstraints.getSourceEndContextClass(), creationConstraints.getTargetEndContextClass()) FOR creationConstraints.sourceEnd.provider-»
«ENDIF-»
«IF null != creationConstraints.targetEnd-»
- «EXPAND checkAdditionalConstraint(creationConstraints.targetEnd, targetConstraintFieldName(this), "target", "source", creationConstraints.getTargetEndContextClass(), creationConstraints.getSourceEndContextClass()) FOR getDiagram().editorGen.expressionProviders.getProvider(creationConstraints.targetEnd)-»
+ «EXPAND checkAdditionalConstraint(creationConstraints.targetEnd, targetConstraintFieldName(this), "target", "source", creationConstraints.getTargetEndContextClass(), creationConstraints.getSourceEndContextClass()) FOR creationConstraints.targetEnd.provider-»
«ENDIF-»
return true;
} catch(Exception e) {
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
index e275a2694..5da05dffc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE ChildContainerCanonicalEditPolicy FOR gmfgen::GenChildContainer-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt
index 9e488045b..22e6661c2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE CompartmentItemSemanticEditPolicy FOR gmfgen::GenCompartment-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
index 8f6329af5..eccbee912 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::editpolicies::Utils»
«EXTENSION xpt::diagram::updater::Utils»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt
index 08f857272..d65991e57 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE DiagramItemSemanticEditPolicy FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt
index 5ac72986c..22fe96a26 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE GraphicalNodeEditPolicy FOR gmfgen::GenNode-»
«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
index 484e6b776..a300ef2ef 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::GenModelUtils»
«DEFINE LinkItemSemanticEditPolicy FOR gmfgen::GenLink-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext
index ee5c0f240..9a7c7400d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
index 859a6cb8e..25fc30ed0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
@@ -16,7 +16,7 @@
elements and meaningless (should not be generated) for pure design nodes.
«ENDREM»
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editpolicies::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
index 21276d553..50ef2c80a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editpolicies::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
index ff5c2ff5c..4610130de 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE TextSelectionEditPolicy FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext
index 6cba80170..89cbf45d0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
extension xpt::diagram::editpolicies::LinkUtils;
extension xpt::GenModelUtils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
index 1ce6a6ef1..0e07ec62b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::GenModelUtils»
«DEFINE childContainerCreateCommand FOR List[gmfgen::GenNode]-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
index 74dd1bab4..74911e6be 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - creation logic was moved in commands
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editpolicies::Utils»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt
index 13357bdc5..a9f697b74 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramAppearancePreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt
index cb7714b95..a2c4af6b0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramConnectionsPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt
index 481203503..5455dfafe 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramGeneralPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
index 4f969db27..4b3a1533b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramPreferenceInitializer«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt
index dde5a9333..161758258 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramPrintingPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt
index 55e4a6aa2..a19f299ae 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramRulersAndGridPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
index bcdec759d..5c7892098 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
index 4c1baa47d..63b401265 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
index a73895cf5..172b9bef4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE LinkDescriptor FOR gmfgen::GenDiagramUpdater-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
index 3a9a35fc5..a06f4f49d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE NodeDescriptor FOR gmfgen::GenDiagramUpdater-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt
index 651ec7b74..ae936c2b8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE UpdateCommand FOR gmfgen::GenDiagramUpdater-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext
index 36bfc0e12..7c31de94e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
extension xpt::diagram::editpolicies::LinkUtils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt
index 8dc91d850..5098f604d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::diagram::updater::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt
index 22c1c7045..d32434c75 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE extensions FOR gmfgen::GenDiagramUpdater-»
<extension point="org.eclipse.ui.commands">
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/CompartmentViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/CompartmentViewFactory.xpt
index b3122dd7e..e1cb6e20b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/CompartmentViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/CompartmentViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«DEFINE CompartmentViewFactory FOR gmfgen::GenCompartment-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt
index 95b7fec48..4b275e7df 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE DiagramViewFactory FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/FloatingLabelViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/FloatingLabelViewFactory.xpt
index e999f59de..a26a14ca6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/FloatingLabelViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/FloatingLabelViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelNodeViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelNodeViewFactory.xpt
index b923307b5..1718b8d52 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelNodeViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelNodeViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelViewFactory.xpt
index 14645ffca..bfeb799e0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LabelViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«DEFINE LabelViewFactory FOR gmfgen::GenNodeLabel-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LinkViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LinkViewFactory.xpt
index a12fb2258..c0c26dca1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LinkViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/LinkViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«DEFINE LinkViewFactory FOR gmfgen::GenLink-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/NodeViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/NodeViewFactory.xpt
index d01008fbf..50d4f2abc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/NodeViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/NodeViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
index bc39a5a6f..07d303a62 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
index 4f2cb7f55..eba0f1179 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE ActionBarContributor FOR gmfgen::GenEditorView-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreateShortcutAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreateShortcutAction.xpt
index e8e0ac678..799ddc1a1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreateShortcutAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreateShortcutAction.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::editor::Utils»
«DEFINE CreateShortcutAction FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
index c144b26a6..29261f019 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
index 5a431df7a..230bba955 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
index 4350c3800..4c46f58a7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::updater::Utils»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
index 6391ae386..91e4623cc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::GenDiagram»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
index 00c1799fb..fbd82b222 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::editor::Utils»
«DEFINE DocumentProvider FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt
index 99afb7e32..20fcaa13a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt
index 66a5e029c..43fe7fa6e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
index f7eca6208..4988d9d03 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext
index cf98ab8b5..364647d29 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
extension xpt::GenModelUtils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
index d4947bb97..4c19fde76 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - rewritten in xpand
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/LoadResourceAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/LoadResourceAction.xpt
index c160eadc6..01ebd3fbc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/LoadResourceAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/LoadResourceAction.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE LoadResourceAction FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
index 773279d2f..5e222e77c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE MatchingStrategy FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
index da89225da..62f819529 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::GenDiagram»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
index 8da63488e..8961f23d5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - rewritten in xpand
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
index 129f4cb21..329c41400 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«REM»Inner class of DocumentProvider«ENDREM»
«DEFINE ResourceSetInfo FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
index e17ed6699..dd327af29 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«REM»Inner class of DocumentProvider«ENDREM»
«DEFINE ResourceSetModificationListener FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
index 417e0017e..b91f4bb45 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::GenDiagram»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
index 4c55fd9fd..fe0a3a259 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE ShortcutPropertyTester FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
index 7210e6b58..86ddc2c28 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE UriEditorInputTester FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext
index cebe12183..9399c85c2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
index c7413e842..a2acf3972 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
index 6343400f3..bf1c89d51 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
index cf982a74c..0ebd8731a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
@@ -305,19 +305,19 @@ private static boolean isDiagram(«EXPAND MetaModel::QualifiedClassName FOR domai
«DEFINE _constraintMethods FOR GenDiagram-»
«IF null != editorGen.expressionProviders-»
- «EXPAND _constraintMethod(editorGen.expressionProviders) FOREACH topLevelNodes.select(n | n.modelFacet.modelElementSelector != null)-»
- «EXPAND _constraintMethod(editorGen.expressionProviders) FOREACH childNodes.select(n | n.modelFacet.modelElementSelector != null)-»
+ «EXPAND _constraintMethod FOREACH topLevelNodes.select(n | n.modelFacet.modelElementSelector != null)-»
+ «EXPAND _constraintMethod FOREACH childNodes.select(n | n.modelFacet.modelElementSelector != null)-»
«FOREACH links AS l»«EXPAND _constraintMethod(l) FOR l.modelFacet»«ENDFOREACH»
«ENDIF-»
«ENDDEFINE»
-«DEFINE _constraintMethod(GenExpressionProviderContainer c) FOR GenNode-»
-«EXPAND _domainElementConstraintMethod(this, modelFacet.modelElementSelector, modelFacet.metaClass) FOR c.getProvider(modelFacet.modelElementSelector)»
+«DEFINE _constraintMethod FOR GenNode-»
+«EXPAND _domainElementConstraintMethod(this, modelFacet.modelElementSelector, modelFacet.metaClass) FOR modelFacet.modelElementSelector.provider»
«ENDDEFINE»
«DEFINE _constraintMethod(GenLink l) FOR LinkModelFacet»«ENDDEFINE» // no-op
«DEFINE _constraintMethod(GenLink l) FOR TypeLinkModelFacet-»
-«IF modelElementSelector != null»«EXPAND _domainElementConstraintMethod(l, modelElementSelector, metaClass) FOR l.getDiagram().editorGen.expressionProviders.getProvider(modelElementSelector)»«ENDIF-»
+«IF modelElementSelector != null»«EXPAND _domainElementConstraintMethod(l, modelElementSelector, metaClass) FOR modelElementSelector.provider»«ENDIF-»
«ENDDEFINE»
@@ -344,7 +344,7 @@ private static boolean isDiagram(«EXPAND MetaModel::QualifiedClassName FOR domai
«EXPAND xpt::Common::generatedMemberComment»
private static boolean «EXPAND _domainElementConstraintMethodName FOR diagramElement»(«EXPAND MetaModel::QualifiedClassName FOR context» domainElement) {
if («constraintFieldName(diagramElement)» == null) { // lazy initialization
- «constraintFieldName(diagramElement)» = «getQualifiedClassName()».«getExpressionAccessor(expression)»(«expression.getBodyString()», «EXPAND MetaModel::MetaClass FOR context»); «EXPAND xpt::Common::nonNLS»
+ «constraintFieldName(diagramElement)» = «EXPAND xpt::expressions::getExpression::getExpression(expression, context)»; «EXPAND xpt::Common::nonNLS»
}
Object result = «constraintFieldName(diagramElement)».evaluate(domainElement);
return result instanceof Boolean && ((Boolean)result).booleanValue();
@@ -357,7 +357,7 @@ private static boolean isDiagram(«EXPAND MetaModel::QualifiedClassName FOR domai
«DEFINE _constraintField(GenCommonBase diagramElement) FOR ModelFacet»«ENDDEFINE»
«DEFINE _constraintField(GenCommonBase diagramElement) FOR TypeModelFacet-»
-«IF modelElementSelector != null»«EXPAND _constraintField(diagramElement) FOR diagramElement.getDiagram().editorGen.expressionProviders.getProvider(modelElementSelector)»«ENDIF-»
+«IF modelElementSelector != null»«EXPAND _constraintField(diagramElement) FOR modelElementSelector.provider»«ENDIF-»
«ENDDEFINE»
«DEFINE _constraintField(GenCommonBase diagramElement) FOR GenExpressionInterpreter»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
index 61b6a3fab..7709a7e4c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenEditorGenerator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
index 71fa49622..d247cb7fa 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::palette::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext
index 8f161d1a0..8e03273a5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
// TODO instead, use smth like plugin::Utils::activatorFQN(palette.diagram.editorGen.plugin)
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
index 8d1465181..3d45d0f28 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE AbstractExpression FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
index 205fe3dda..175cbe5c7 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE OCLExpressionFactory FOR gmfgen::GenExpressionInterpreter-»
«EXPAND xpt::Common::copyright FOR container.editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
index 1e1d9ffe1..1ca3a97c7 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE RegexpExpressionFactory FOR gmfgen::GenExpressionInterpreter-»
«EXPAND xpt::Common::copyright FOR container.editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.ext
index f3699fc66..1cee4d00e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.ext
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
index e036091e1..49107cb60 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
index ee1ad443e..4bd5f2c37 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE AbstractNavigatorItem FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
index e5c32a4de..d3204535d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE DomainNavigatorContentProvider FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
index 5f81963e0..df03b7b16 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE DomainNavigatorItem FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
index de1ab66d6..d8c543c9a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE DomainNavigatorLabelProvider FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
index 9fe72f179..3c1c2e8cb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::navigator::Utils»
«DEFINE NavigatorActionProvider FOR gmfgen::GenNavigator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
index 525d25180..1e858327a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::navigator::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
index 84beb82fe..1486853e9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE NavigatorGroup FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
index 7eb899c86..ac9bfebaf 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE NavigatorItem FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
index f09c881d2..da93a78d5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::navigator::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
index 0193e8166..aa5053c70 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::navigator::Utils»
«DEFINE NavigatorLinkHelper FOR gmfgen::GenNavigator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
index b26b618d9..59d8270d1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::navigator::Utils»
«DEFINE NavigatorSorter FOR gmfgen::GenNavigator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext
index a123df1af..962a57339 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
index 3c3d9ecde..5b0328eed 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
index 6bf7cdce8..d1fe1a2d7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE getEditorInput FOR gmfgen::GenEditorGenerator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt
index fa564e498..40f196204 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt
index ab8b4c510..c0fd4b079 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt
index 02ae33c73..2598d1dba 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt
index 1b9d912ed..4d3347aa9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt
index f6aa02464..a5f8624ab 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt
index 7da28e16e..19dc2def7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/i18n.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/i18n.ext
index 187ec4516..258d3c44c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/i18n.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/i18n.ext
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
String defaultAbstractParserClassName(gmfgen::GenDiagram diagram) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
index 74336ddda..3b19736a8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::GenModelUtils»
«DEFINE Activator FOR gmfgen::GenPlugin-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt
index 13162693f..302de0aee 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE build FOR gmfgen::GenPlugin-»
bin.includes = .,\
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt
index b451116f9..aab34da56 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt
index 596fc5e74..fcc6aba25 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE options FOR gmfgen::GenPlugin-»
# Tracing options for the «iD» plug-in
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt
index 0fca1eb21..352459d5f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::Utils»
«EXTENSION xpt::GenEditorGenerator»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt
index c59ccac49..a7115f6f2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
index 647b4d922..0ff551da1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE Class FOR gmfgen::GenPropertySheet»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
index a047cda6d..eaa5af702 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE Class FOR gmfgen::GenCustomPropertyTab»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
index a4d0c03e1..984321423 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenPropertySheet-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ContributionItemProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ContributionItemProvider.xpt
index b73df17a5..13136d4ef 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ContributionItemProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ContributionItemProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE ContributionItemProvider FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
index e42c908eb..7e314e322 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE EditPartProvider FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.ext
index 47aabff1b..15af0b7a4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.ext
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
@@ -21,21 +21,31 @@ boolean expressionResultNeedsCast(GenClass c) : false ;
boolean expressionResultNeedsCast(GenDataType c) : isNumberObject(c) || isPrimitiveNumberType(c) ;
boolean expressionResultNeedsCast(GenEnum c) : true ;
-String javaMethodName(GenCommonBase diagramElement, GenFeatureValueSpec valueSpec) :
- "value_" + diagramElement.getClassNamePrefix() + "_" + valueSpec.featureSeqInitializer.elementClass.ecoreClass.name + "_" + valueSpec.feature.ecoreFeature.name
+String javaMethodName(GenFeatureValueSpec valueSpec) :
+ "value_" + valueSpec.feature.ecoreFeature.name
;
-/*
- XXX instead of all these recursion may write javaInitializers template the same way performInit
- is written, i.e. re-dispatch from GenReferenceNewElementSpec
- */
-List[GenFeatureValueSpec] getFeatureInitializers(GenFeatureSeqInitializer si, GenJavaExpressionProvider jp) :
- recurseCollectValueExpr(si).intersect(jp.expressions)
+List[GenFeatureValueSpec] getJavaValueSpecs(GenDiagram gd) :
+ getJavaValueSpecs(allTypeModelFacets(gd), gd.editorGen.expressionProviders)
+;
+
+// privates
+
+private List[TypeModelFacet] allTypeModelFacets(GenDiagram gd) :
+ gd.topLevelNodes.modelFacet.union(gd.childNodes.modelFacet).union(gd.links.modelFacet).typeSelect(TypeModelFacet)
+;
+
+private List[GenFeatureValueSpec] getJavaValueSpecs(List[TypeModelFacet] modelFacets, GenExpressionProviderContainer c) :
+ getJavaValueSpecs(modelFacets.modelElementInitializer.typeSelect(GenFeatureSeqInitializer), c.providers.typeSelect(GenJavaExpressionProvider).expressions)
+;
+
+private List[GenFeatureValueSpec] getJavaValueSpecs(List[GenFeatureSeqInitializer] elementInitializers, List[ValueExpression] allJavaExpressions) :
+ elementInitializers.recurseCollectValueSpec().select(vs | allJavaExpressions.contains(vs.value))
;
-private List[ValueExpression] recurseCollectValueExpr(GenFeatureSeqInitializer si) :
+private List[GenFeatureValueSpec] recurseCollectValueSpec(GenFeatureSeqInitializer si) :
si.initializers.typeSelect(GenFeatureValueSpec).union(
- si.initializers.typeSelect(GenReferenceNewElementSpec).newElementInitializers.recurseCollectValueExpr().flatten())
+ si.initializers.typeSelect(GenReferenceNewElementSpec).newElementInitializers.recurseCollectValueSpec().flatten())
;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
index aaaf2f880..80c8a29ea 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
@@ -14,7 +14,7 @@
*/
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::providers::ElementInitializers»
@@ -37,12 +37,32 @@ public class ElementInitializers {
«ENDDEFINE»
«DEFINE JavaSupport FOR GenDiagram-»
-«IF editorGen.expressionProviders != null && !editorGen.expressionProviders.providers.typeSelect(GenJavaExpressionProvider).isEmpty()-»
- «EXPAND javaInitializer FOREACH getAllNodes()-»
- «EXPAND javaInitializer FOREACH links-»
+«IF editorGen.expressionProviders != null-»
+«LET getJavaValueSpecs(this) AS javaValueSpecs-»
+«FOREACH javaValueSpecs.value.purgeDups() AS valueExpr-»
+«FOREACH javaValueSpecs.select(vs | vs.value == valueExpr).feature.purgeDups() AS genFeature-»
+«LET (GenFeatureValueSpec) javaValueSpecs.select(vs | vs.value == valueExpr && vs.feature == genFeature).first() AS vs»
+ «EXPAND xpt::Common::generatedMemberComment»
+ private static «EXPAND MetaModel::featureTargetType FOR vs.feature» «javaMethodName(vs)»(«EXPAND MetaModel::QualifiedClassName FOR vs.featureSeqInitializer.elementClass» self) {
+«IF ((GenJavaExpressionProvider) vs.value.provider).injectExpressionBody && vs.value.body != null && vs.value.body.length() != 0-»
+ «vs.value.body»
+«ELSEIF ((GenJavaExpressionProvider) vs.value.provider).throwException || vs.value.body == null || vs.value.body.length() == 0-»
+ // TODO: implement this method to return value
+ // for «EXPAND MetaModel::MetaFeature FOR vs.feature»
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new java.lang.UnsupportedOperationException("No user java implementation provided in '«javaMethodName(vs)»' operation");«EXPAND xpt::Common::nonNLS»
+«ELSE-»
+ return null;
+«ENDIF-»
+ }
+«ENDLET-»
+«ENDFOREACH-»
+«ENDFOREACH-»
+«ENDLET-»
«ENDIF-»
«ENDDEFINE»
+
«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
@@ -75,7 +95,7 @@ public class ElementInitializers {
«DEFINE performInit(GenCommonBase diagramElement, String instanceVar, GenClass instanceClass, int count) FOR GenFeatureInitializer»«ENDDEFINE»
«DEFINE performInit(GenCommonBase diagramElement, String instanceVar, GenClass instanceClass, int count) FOR GenFeatureValueSpec-»
- Object value«count» = «EXPAND evaluateExpr(diagramElement, this, instanceVar) FOR diagramElement.getDiagram().editorGen.expressionProviders.getProvider(this)»;
+ Object value«count» = «EXPAND evaluateExpr(diagramElement, this, instanceVar) FOR value.provider»;
«IF isListType(feature)-»
if (value«count» instanceof java.util.Collection) {
«EXPAND MetaModel::getFeatureValue(instanceVar, instanceClass, true) FOR feature».clear();
@@ -120,45 +140,9 @@ public class ElementInitializers {
// XXX perhaps, using instance.eClass() is better option than MetaModel::MetaClass (though, need to rely on instance variable name/type)
«DEFINE evaluateExpr(GenCommonBase diagramElement, GenFeatureValueSpec valueExpr, String instanceVar) FOR GenExpressionInterpreter-»
-«EXPAND xpt::expressions::getExpression::getExpression(valueExpr, valueExpr.featureSeqInitializer.elementClass)».evaluate(«instanceVar»)«-»
+«EXPAND xpt::expressions::getExpression::getExpression(valueExpr.value, valueExpr.featureSeqInitializer.elementClass)».evaluate(«instanceVar»)«-»
«ENDDEFINE»
«DEFINE evaluateExpr(GenCommonBase diagramElement, GenFeatureValueSpec valueExpr, String instanceVar) FOR GenJavaExpressionProvider-»
-«javaMethodName(diagramElement, valueExpr)»(«instanceVar»)«-»
+«javaMethodName(valueExpr)»(«instanceVar»)«-»
«ENDDEFINE»
-
-
-«REM»
- Definitions of Java initialization methods.
-«ENDREM»
-
-«DEFINE javaInitializer FOR GenNode»«EXPAND javaInitializer(this) FOR modelFacet»«ENDDEFINE»
-«DEFINE javaInitializer FOR GenLink»«EXPAND javaInitializer(this) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE javaInitializer(GenCommonBase diagramElement) FOR ModelFacet»«ENDDEFINE»
-
-«DEFINE javaInitializer(GenCommonBase diagramElement) FOR TypeModelFacet-»
-«EXPAND javaInitializer(diagramElement) FOR modelElementInitializer-»
-«ENDDEFINE»
-
-«DEFINE javaInitializer(GenCommonBase diagramElement) FOR GenElementInitializer»«ENDDEFINE»
-
-«DEFINE javaInitializer(GenCommonBase diagramElement) FOR GenFeatureSeqInitializer-»
-«FOREACH diagramElement.getDiagram().editorGen.expressionProviders.providers.typeSelect(GenJavaExpressionProvider) AS jp-»
-«FOREACH getFeatureInitializers(this, jp) AS valueExpression-»
-«EXPAND xpt::Common::generatedMemberComment»
-private static «EXPAND MetaModel::featureTargetType FOR valueExpression.feature» «javaMethodName(diagramElement, valueExpression)»(«EXPAND MetaModel::QualifiedClassName FOR valueExpression.featureSeqInitializer.elementClass» self) {
-«IF jp.injectExpressionBody && valueExpression.body != null && valueExpression.body.length() != 0-»
- «valueExpression.body»
-«ELSEIF jp.throwException || valueExpression.body == null || valueExpression.body.length() == 0-»
- // TODO: implement this method to return value
- // for «EXPAND MetaModel::MetaFeature FOR valueExpression.feature»
- // Ensure that you remove @generated or mark it @generated NOT
- throw new java.lang.UnsupportedOperationException("No user java implementation provided in '«javaMethodName(diagramElement, valueExpression)»' operation");«EXPAND xpt::Common::nonNLS»
-«ELSE-»
- return null;
-«ENDIF-»
-}
-«ENDFOREACH-»
-«ENDFOREACH-»
-«ENDDEFINE» \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementTypes.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementTypes.xpt
index 87827e91d..d4f9b95f3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementTypes.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementTypes.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt
index 08fb5592b..ec865986f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE IconProvider FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
index d80bb1302..1e98974e4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
index 2e502414f..659e76c5f 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
@@ -11,7 +11,7 @@
* Artem Tikhomirov (Borland) - refactoring (https://bugs.eclipse.org/230014)
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
@@ -354,7 +354,7 @@ public class «metricProviderClassName»
«DEFINE metricCalcMethod FOR GenMetricRule»
«EXPAND xpt::Common::generatedMemberComment»
public static«REM»FIXME: (1) refactor to get rid of statics (2) 'public' only those referenced from audits«ENDREM» Double «calcMethodName()»(«EXPAND calcMethodArgs(this) FOR target») {
- «EXPAND calcMethodBody(this) FOR container.editorGen.expressionProviders.getProvider(rule)-»
+ «EXPAND calcMethodBody(this) FOR rule.provider-»
}
«ENDDEFINE»
@@ -402,7 +402,7 @@ public class «metricProviderClassName»
«ENDDEFINE»
«DEFINE metricCalcField FOR GenMetricRule-»
-«EXPAND metricCalcField(this) FOR container.editorGen.expressionProviders.getProvider(rule)-»
+«EXPAND metricCalcField(this) FOR rule.provider-»
«ENDDEFINE»
«DEFINE metricCalcField(GenMetricRule metric) FOR GenExpressionProviderBase»«REM»NO-OP«ENDREM»«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.ext
index 7a454330a..0d1b8155b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.ext
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
cached List[GenMetricRule] getNotationMetrics(GenMetricContainer c) : c.metrics.select(m | !{ m.target }.typeSelect(GenNotationElementTarget).isEmpty()) ;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
index 237e3456d..d96f6104e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
@@ -11,7 +11,7 @@
* Artem Tikhomirov (Borland) - refactoring (https://bugs.eclipse.org/230014)
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»ResultView«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
index 7f364560b..a45870350 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«EXTENSION xpt::diagram::Utils»
«EXTENSION xpt::providers::i18n»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserProvider.xpt
index 13a21b485..a57c2f0ee 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::providers::ParserUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.ext
index 1cc6d727f..860f66a09 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
index ffc73b785..4ff0682f4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«DEFINE ShortcutsDecoratorProvider FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
index 6a6afab4b..32e77c294 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
index 302a0db14..4a91b9624 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
@@ -12,7 +12,7 @@
* straightforward and simple #validate() implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::GenModelUtils»
@@ -249,7 +249,7 @@ static boolean isInDefaultEditorContext(Object object) {
«EXPAND xpt::Common::generatedMemberComment»
public static class «getConstraintAdapterLocalClassName()» extends org.eclipse.emf.validation.AbstractModelConstraint {
-«IF container.getProvider(rule).getLanguage().value != GenLanguage::java.value-»
+«IF rule.provider.getLanguage().value != GenLanguage::java.value-»
«EXPAND xpt::Common::generatedMemberComment»
private «container.getAbstractExpressionQualifiedClassName()» expression;
@@ -257,7 +257,7 @@ static boolean isInDefaultEditorContext(Object object) {
«EXPAND xpt::Common::generatedMemberComment»
public org.eclipse.core.runtime.IStatus validate(org.eclipse.emf.validation.IValidationContext ctx) {
«EXPAND constraintAdapter_initContext(this) FOR target-»
- «EXPAND constraintAdapter_validateMethod(this) FOR container.getProvider(rule)»
+ «EXPAND constraintAdapter_validateMethod(this) FOR rule.provider-»
}
}
«ENDIF-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
index 3d7b696d5..6a57456a2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/extensions.xpt
index 09edb5f98..a72fb3b72 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.ext
index e548904ea..ddd4ae974 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.ext
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2006/GenModel";
+import "http://www.eclipse.org/gmf/2008/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
String i18nKeyForModelingAssistantProvider(gmfgen::GenDiagram diagram) :

Back to the top