Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.gmf.codegen/templates/xpt')
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.qvto22
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.qvto37
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.qvto19
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenModelUtils.qvto64
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/NonNLSUtils.qvto11
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.qvto45
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.qvto2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto14
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt4
-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.qvto2
-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.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto86
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt4
-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.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt17
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt4
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt4
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto26
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.qvto126
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.qvto44
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt4
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt4
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.qvto20
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.qvto19
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto86
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt4
-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.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt4
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.qvto33
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.qvto20
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt4
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt4
-rwxr-xr-xplugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt4
-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.qvto28
129 files changed, 664 insertions, 473 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
index 2b51ce783..8ded7fb84 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 dbb98dd7b..b96d23eae 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::GenAuditRoot»
«EXTENSION xpt::GenEditorGenerator»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
index 4e8ef19d1..028c59371 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::ExternalizerUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.qvto
index 8e8bb5381..864025257 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.qvto
@@ -1,16 +1,24 @@
+/*
+ * Copyright (c) 2006, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Anna Karjakina (Borland) - initial API and implementation
+ */
+
import xpt.StringOperations;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library ExternalizerUtils;
-helper getExternalizerPackageName(generator : genModel::GenEditorGenerator) : String {
- return generator.editor.packageName
-}
+helper getExternalizerPackageName(generator : gmfgen::GenEditorGenerator) : String { return generator.editor.packageName }
-helper getExternalizerClassName() : String {
- return 'Messages'
-}
+helper getExternalizerClassName() : String { return 'Messages' }
helper escapeIllegalKeySymbols(key : String) : String {
return key.xpandReplaceAll('[=&\"]', '').xpandReplaceAll('[ .]', '_')
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.qvto
index 4c8839345..3f5bb31b0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.qvto
@@ -1,35 +1,48 @@
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
import xpt.GenEditorGenerator;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
-modeltype genModel_1 uses "http://www.eclipse.org/emf/2002/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
+modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
library GenAuditRoot;
-helper getAllTargetedModelPackages(root : genModel::GenAuditRoot) : Sequence(genModel_1::GenPackage) {
+helper getAllTargetedModelPackages(root : gmfgen::GenAuditRoot) : Sequence(genmodel::GenPackage) {
return root.rules->select(r | r.target <> null and r.target.getTargetClass() <> null)->collect(r | r.target.getTargetClass().genPackage)->asOrderedSet()->asSequence()
}
-helper getQualifiedIdentity(ctx : genModel::GenAuditContext) : String {
+helper getQualifiedIdentity(ctx : gmfgen::GenAuditContext) : String {
return ctx.root.editorGen.plugin.iD + ctx.id
}
-helper hasDiagramElementTargetRule(audits : genModel::GenAuditRoot) : Boolean {
- return audits <> null and (audits.rules.target)[genModel::GenDiagramElementTarget]->size() > 0
+helper hasDiagramElementTargetRule(audits : gmfgen::GenAuditRoot) : Boolean {
+ return audits <> null and (audits.rules.target)[gmfgen::GenDiagramElementTarget]->size() > 0
}
-helper hasAnyNotationElementTargetRule(audits : genModel::GenAuditRoot) : Boolean {
- return audits <> null and (audits.rules.target)[genModel::GenNotationElementTarget]->size() > 0
+-- MODIFIERS: private
+helper hasAnyNotationElementTargetRule(audits : gmfgen::GenAuditRoot) : Boolean {
+ return audits <> null and (audits.rules.target)[gmfgen::GenNotationElementTarget]->size() > 0
}
-helper shouldRunValidateOnDiagram(audits : genModel::GenAuditRoot) : Boolean {
+helper shouldRunValidateOnDiagram(audits : gmfgen::GenAuditRoot) : Boolean {
return hasDiagramElementTargetRule(audits) or hasAnyNotationElementTargetRule(audits)
}
-helper getTargetDiagramElements(ctx : genModel::GenAuditContext) : Sequence(genModel::GenCommonBase) {
- return (ctx.ruleTargets)[genModel::GenDiagramElementTarget].element->asOrderedSet()->asSequence()
+helper getTargetDiagramElements(ctx : gmfgen::GenAuditContext) : Sequence(gmfgen::GenCommonBase) {
+ return (ctx.ruleTargets)[gmfgen::GenDiagramElementTarget].element->asOrderedSet()->asSequence()
}
-helper getAllTargetDiagramElements(root : genModel::GenAuditRoot) : Sequence(genModel::GenCommonBase) {
+helper getAllTargetDiagramElements(root : gmfgen::GenAuditRoot) : Sequence(gmfgen::GenCommonBase) {
return root.clientContexts->collect(it | getTargetDiagramElements(it))->asOrderedSet()->asSequence()
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.qvto
index e2ca0489d..ea1396c55 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.qvto
@@ -1,7 +1,20 @@
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library GenEditorGenerator;
-helper hasAudits(editorGen : genModel::GenEditorGenerator) : Boolean {
- return editorGen.audits <> null and not editorGen.audits.rules->isEmpty()
+-- FIXME remove java-only GenEditorGenerator#hasAudits or declare it in metamodel
+helper hasAudits(editorGen : gmfgen::GenEditorGenerator) : Boolean {
+ return editorGen.audits <> null and editorGen.audits.rules->notEmpty()
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenModelUtils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenModelUtils.qvto
index f314ceadc..b9ecd7921 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenModelUtils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenModelUtils.qvto
@@ -1,40 +1,76 @@
+/*
+ * Copyright (c) 2006, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Dmitry Stadnik (Borland) - initial API and implementation
+ */
+
import org.eclipse.gmf.internal.codegen.util.GenModelUtils;
import xpt.StringOperations;
-modeltype genModel uses "http://www.eclipse.org/emf/2002/GenModel";
+modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
library GenModelUtils;
+/*
+ * GenModel functionality unrelated to EMF generated code
+ * or metamodel access only.
+ */
-
-helper getReverse(feature : genModel::GenFeature) : genModel::GenFeature {
- return (if isReferenceType(feature) then let eReverseFeature = feature.ecoreFeature.oclAsType(ecore::EReference).eOpposite in (if eReverseFeature <> null then let genClass = findGenClassifier(feature.genClass.genPackage.genModel, eReverseFeature.eContainingClass).oclAsType(genModel::GenClass) in (if genClass <> null then genClass.genFeatures->select(e | e.ecoreFeature = eReverseFeature)->first() else null endif) else null endif) else null endif)
+--GenFeature#getReverse
+helper getReverse(feature : genmodel::GenFeature) : genmodel::GenFeature {
+ return (if isReferenceType(feature) then let eReverseFeature = feature.ecoreFeature.oclAsType(ecore::EReference).eOpposite in (if eReverseFeature <> null then let genClass = findGenClassifier(feature.genClass.genPackage.genModel, eReverseFeature.eContainingClass).oclAsType(genmodel::GenClass) in (if genClass <> null then genClass.genFeatures->select(e | e.ecoreFeature = eReverseFeature)->first() else null endif) else null endif) else null endif)
}
+-- For primitive types, return their java.lang wrappers, for non-primitive
+-- types returns instanceClassName as is
helper getObjectCompatibleClassName(dt : ecore::EDataType) : String {
- return (if dt.instanceClassName.xpandToCharList()->includes('.') then dt.instanceClassName else switch { case (dt.instanceClassName = 'boolean') 'java.lang.Boolean'; case (dt.instanceClassName = 'byte') 'java.lang.Byte'; case (dt.instanceClassName = 'char') 'java.lang.Character'; case (dt.instanceClassName = 'double') 'java.lang.Double'; case (dt.instanceClassName = 'float') 'java.lang.Float'; case (dt.instanceClassName = 'int') 'java.lang.Integer'; case (dt.instanceClassName = 'long') 'java.lang.Long'; case (dt.instanceClassName = 'short') 'java.lang.Short'; else 'java.lang.Object'; } endif)
+ return (if dt.instanceClassName.indexOf('.') > 0 then dt.instanceClassName else
+ switch {
+ case (dt.instanceClassName = 'boolean') 'java.lang.Boolean';
+ case (dt.instanceClassName = 'byte') 'java.lang.Byte';
+ case (dt.instanceClassName = 'char') 'java.lang.Character';
+ case (dt.instanceClassName = 'double') 'java.lang.Double';
+ case (dt.instanceClassName = 'float') 'java.lang.Float';
+ case (dt.instanceClassName = 'int') 'java.lang.Integer';
+ case (dt.instanceClassName = 'long') 'java.lang.Long';
+ case (dt.instanceClassName = 'short') 'java.lang.Short';
+ else 'java.lang.Object';
+ }
+ endif)
}
-
-
-
-helper getTypeGenClassifier(feature : genModel::GenFeature) : genModel::GenClassifier {
+--GenFeature#getTypeGenClassifier()
+helper getTypeGenClassifier(feature : genmodel::GenFeature) : genmodel::GenClassifier {
return findGenClassifier(feature.genClass.genPackage.genModel, feature.ecoreFeature.eType)
}
-helper isExternalInterface(genClass : genModel::GenClass) : Boolean {
+-- FIXME: for models loaded from generated package (e.g. gmf tests often
+-- refer to EClass/EOperation directly from EcorePackage) instanceClassName
+-- is always set and thus all metamodel types are treated as external interfaces,
+-- with useless casts to EObject
+--
+-- GenClass#isExternalInterface()
+helper isExternalInterface(genClass : genmodel::GenClass) : Boolean {
return null <> genClass.ecoreClass.instanceClassName
}
-helper isContains(gf : genModel::GenFeature) : Boolean {
+-- GenFeatureImpl#isContains
+helper isContains(gf : genmodel::GenFeature) : Boolean {
return isReferenceType(gf) and gf.ecoreFeature.oclAsType(ecore::EReference).containment
}
-helper isPrimitiveType(gf : genModel::GenFeature) : Boolean {
+helper isPrimitiveType(gf : genmodel::GenFeature) : Boolean {
return Sequence { 'boolean', 'byte', 'char', 'double', 'float', 'int', 'long', 'short' }->includes(gf.ecoreFeature.eType.instanceClassName)
}
-helper isReferenceType(gf : genModel::GenFeature) : Boolean {
- return not (Sequence { gf.ecoreFeature })[ecore::EReference]->isEmpty()
+-- MODIFIERS:private
+helper isReferenceType(gf : genmodel::GenFeature) : Boolean {
+ return gf.ecoreFeature.oclIsKindOf(ecore::EReference)
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/NonNLSUtils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/NonNLSUtils.qvto
index cd397dc70..ca4b7b2c5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/NonNLSUtils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/NonNLSUtils.qvto
@@ -1,3 +1,14 @@
+/*
+ * Copyright (c) 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexander Shatalin (Borland) - initial API and implementation
+ */
library NonNLSUtils;
property counter : Sequence(Integer) = Sequence{};
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 afefe9c7e..62d2aa2f5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 0543e7b46..72e6c7aeb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 3bdcfff58..91504c441 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 adec03972..18e424c40 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 925ca847a..db12c6d41 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 0d3c81408..164aeb308 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 ddd2eb7e2..3b6969d40 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.qvto
index db283db08..7b186c4e5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.qvto
@@ -1,20 +1,31 @@
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Anna Karjakina (Borland) - initial API and implementation
+ */
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library i18n;
-helper i18nKeyForDefaultFileEditorErrorDialog(app : genModel::GenApplication) : String {
+helper i18nKeyForDefaultFileEditorErrorDialog(app : gmfgen::GenApplication) : String {
return app.actionBarAdvisorClassName + '.DefaultFileEditor'
}
-helper i18nKeyForDefaultEditorOpenErrorDialog(app : genModel::GenApplication) : String {
+helper i18nKeyForDefaultEditorOpenErrorDialog(app : gmfgen::GenApplication) : String {
return app.actionBarAdvisorClassName + '.DefaultEditorOpenError'
}
-helper i18nKeyForWindowTitle(app : genModel::GenApplication) : String {
+helper i18nKeyForWindowTitle(app : gmfgen::GenApplication) : String {
return app.workbenchWindowAdvisorClassName + '.Title'
}
-helper i18nKeyForAboutDialog(app : genModel::GenApplication) : String {
+helper i18nKeyForAboutDialog(app : gmfgen::GenApplication) : String {
return app.actionBarAdvisorClassName + '.AboutDialog'
}
@@ -26,38 +37,40 @@ helper messageKey(dialogKey : String) : String {
return dialogKey + 'Message'
}
-helper i18nKeyForMenu(menuManager : genModel::GenMenuManager) : String {
+helper i18nKeyForMenu(menuManager : gmfgen::GenMenuManager) : String {
return 'ApplicationMenuName.' + menuManager.name
}
-helper collectGenMenuManagers(allItems : Collection(genModel::GenContributionItem)) : Sequence(genModel::GenMenuManager) {
- return (collectAllContributionItems(allItems))[genModel::GenMenuManager]
+-- FIXME move out from i18n, has nothing to do with l10n
+helper collectGenMenuManagers(allItems : OrderedSet(gmfgen::GenContributionItem)) : Sequence(gmfgen::GenMenuManager) {
+ return collectAllContributionItems(allItems->asSequence())[gmfgen::GenMenuManager]
}
-helper collectAllContributionItems(allItems : Collection(genModel::GenContributionItem)) : Sequence(genModel::GenContributionManager) {
- return let managers = (allItems->collect(it | it))[genModel::GenContributionManager]->asSequence() in managers->union(managers->collect(item | collectAllContributionItems(item.items))->flatten())
+helper collectAllContributionItems(allItems : Sequence(gmfgen::GenContributionItem)) : Sequence(gmfgen::GenContributionManager) {
+ -- FIXME simplify the expression
+ return let managers = allItems[gmfgen::GenContributionManager] in managers->union(managers->collect(item | collectAllContributionItems(item.items->asSequence())))
}
-helper i18nKeyForNewFileWizardFileLabel(app : genModel::GenApplication) : String {
+helper i18nKeyForNewFileWizardFileLabel(app : gmfgen::GenApplication) : String {
return wizardNewFileCreationPageClassName(app) + '.FileLabel'
}
-helper i18nKeyForNewFileWizardBrowseButton(app : genModel::GenApplication) : String {
+helper i18nKeyForNewFileWizardBrowseButton(app : gmfgen::GenApplication) : String {
return wizardNewFileCreationPageClassName(app) + '.BrowseButton'
}
-helper i18nKeyForNewFileWizardSelectDialog(app : genModel::GenApplication) : String {
+helper i18nKeyForNewFileWizardSelectDialog(app : gmfgen::GenApplication) : String {
return wizardNewFileCreationPageClassName(app) + '.SelectNewFileDialog'
}
-helper i18nKeyForNewFileWizardEmpty(app : genModel::GenApplication) : String {
+helper i18nKeyForNewFileWizardEmpty(app : gmfgen::GenApplication) : String {
return wizardNewFileCreationPageClassName(app) + '.EmptyFileNameError'
}
-helper i18nKeyForNewFileWizardInvalid(app : genModel::GenApplication) : String {
+helper i18nKeyForNewFileWizardInvalid(app : gmfgen::GenApplication) : String {
return wizardNewFileCreationPageClassName(app) + '.InvalidFileNameError'
}
-helper wizardNewFileCreationPageClassName(app : genModel::GenApplication) : String {
+helper wizardNewFileCreationPageClassName(app : gmfgen::GenApplication) : String {
return 'WizardNewFileCreationPage'
}
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.qvto
index 83ba9d40a..2e7b48928 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.qvto
@@ -11,7 +11,7 @@
*/
import org.eclipse.gmf.internal.codegen.util.GenModelUtils;
-modeltype gmfgen uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
modeltype notation uses "http://www.eclipse.org/gmf/runtime/1.0.2/notation";
library Utils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto
index 78c53ddcc..1168e0160 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-modeltype gmfgen uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library ViewmapAttributesUtils;
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 969764c76..834a0d269 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 2ef4afb83..ae204e6ef 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 bd46cb821..61c72f676 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 67ca118a7..e6c6c33ee 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
/*
* TODO: remove the template, as it's no longer in use
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 e2609af6f..c37e96208 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 4772f23c9..8d67c76d8 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 7ff98dbfa..36426d4af 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 cd996909c..843be526a 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 60b348301..838323956 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 71eeb0382..06da9d382 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 f5e436dfb..948d5b677 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 8709546c3..82c0cc541 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 abebed619..b761e84ee 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::StringOperations»
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 e505c92c8..e258445f3 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
index 5275ce260..46a6cfb45 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
@@ -1,4 +1,16 @@
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+/*
+ * Copyright (c) 2006, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Dmitry Stadnik (Borland) - initial API and implementation
+ */
+
+modeltype genModel uses "http://www.eclipse.org/gmf/2009/GenModel";
library Utils;
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 6f1b172aa..638b04f35 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/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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/ChildContainerCanonicalEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
index a13e0fed6..182dbc866 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 72cbc5316..e6cb655fd 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006,2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 143126a59..b066d7d5b 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 687c1ff54..b57aba71d 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006,2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 c0590c364..98da1f761 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 e03b33e36..12dcc1694 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
@@ -11,7 +11,7 @@
* Michael Golubev (Borland) - [243151] explicit source/target for links
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::GenModelUtils»
«EXTENSION xpt::diagram::editpolicies::LinkUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto
index 3d9f43de1..516a6ada3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto
@@ -11,7 +11,7 @@
* Michael Golubev (Borland) - [243151] explicit source/target for links
*/
-modeltype gmfgen uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
library LinkUtils;
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 8e85154e2..9af33b7fa 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
@@ -17,7 +17,7 @@
elements and meaningless (should not be generated) for pure design nodes.
«ENDREM»
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 306ca246d..08a5977fd 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 5f1bca683..042d095b6 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto
index b31bf14e8..9e5c60c51 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto
@@ -13,7 +13,7 @@
import xpt.diagram.editpolicies.LinkUtils;
import xpt.GenModelUtils;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype genModel uses "http://www.eclipse.org/gmf/2009/GenModel";
library Utils;
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 675eda752..e52aed10d 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::GenModelUtils»
«DEFINE childContainerCreateCommand FOR Sequence(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 ffd497348..c399b08a6 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,7 +12,7 @@
* Michael Golubev (Borland) - [243151] explicit source/target for links
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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/PreferenceInitializer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
index a67a67305..e01559b95 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::diagram::Utils»
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 eaf445a07..d0bd2742c 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::diagram::Utils»
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 3778df79b..7c33520c0 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
* Michael Golubev (Borland) - [243151] explicit source/target for links
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 5343f13dc..236809832 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 6ed617fae..1c53c2e19 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 490e9c464..92731e3ea 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto
index 9deb8b939..8c2f64215 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto
@@ -1,7 +1,19 @@
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexander Shatalin (Borland) - initial API and implementation
+ */
+
import xpt.diagram.editpolicies.LinkUtils;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
-modeltype genModel_1 uses "http://www.eclipse.org/emf/2002/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
+modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
library Utils;
@@ -17,134 +29,134 @@ helper getOutgoingLinksMethodNameSuffix() : String {
return 'Outgoing'
}
-helper getContainedLinks(metaClass : genModel_1::GenClass, diagram : genModel::GenDiagram) : Sequence(genModel::GenLink) {
+helper getContainedLinks(metaClass : genmodel::GenClass, diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
return diagram.links->select(link | canBeContainer(link, metaClass))->asSequence()
}
-helper getOutgoingLinks(linkEnd : genModel::GenLinkEnd) : Sequence(genModel::GenLink) {
+helper getOutgoingLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
return linkEnd.getDiagram().links->select(link | linkEnd.genOutgoingLinks->includes(link))->asSequence()
}
-helper getIncomingLinks(linkEnd : genModel::GenLinkEnd) : Sequence(genModel::GenLink) {
+helper getIncomingLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
return linkEnd.getDiagram().links->select(link | linkEnd.genIncomingLinks->includes(link))->asSequence()
}
-helper getAllContainedLinks(diagram : genModel::GenDiagram) : Sequence(genModel::GenLink) {
+helper getAllContainedLinks(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
return diagram.links->select(link | not getAllSemanticElements(diagram)->select(commonBase | canBeContainer(link, commonBase.getMetaClass()))->isEmpty())->asSequence()
}
-helper getAllIncomingLinks(diagram : genModel::GenDiagram) : Sequence(genModel::GenLink) {
+helper getAllIncomingLinks(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
return diagram.links->select(link | not link.targets->isEmpty())->asSequence()
}
-helper getAllOutgoingLinks(diagram : genModel::GenDiagram) : Sequence(genModel::GenLink) {
+helper getAllOutgoingLinks(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
return diagram.links->select(link | link.isOutgoingLink())->select(link | not link.sources->isEmpty())->asSequence()
}
-helper genModel::GenLink::isOutgoingLink() : Boolean {
+helper gmfgen::GenLink::isOutgoingLink() : Boolean {
return null <> self.modelFacet and self.modelFacet.isOutgoingLink()
}
-helper genModel::LinkModelFacet::isOutgoingLink() : Boolean {
+helper gmfgen::LinkModelFacet::isOutgoingLink() : Boolean {
return true
}
-helper genModel::TypeLinkModelFacet::isOutgoingLink() : Boolean {
+helper gmfgen::TypeLinkModelFacet::isOutgoingLink() : Boolean {
return null <> self.sourceMetaFeature
}
-helper getAllSemanticDiagramElements(diagram : genModel::GenDiagram) : Sequence(genModel::GenLinkEnd) {
- return ((diagram.getAllNodes()->asSequence())[genModel::GenLinkEnd]->union(diagram.links->asSequence()))[genModel::GenLinkEnd]->select(linkEnd | not linkEnd.getMetaClass().oclIsUndefined())
+helper getAllSemanticDiagramElements(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLinkEnd) {
+ return ((diagram.getAllNodes()->asSequence())[gmfgen::GenLinkEnd]->union(diagram.links->asSequence()))[gmfgen::GenLinkEnd]->select(linkEnd | not linkEnd.getMetaClass().oclIsUndefined())
}
-helper getAllSemanticElements(diagram : genModel::GenDiagram) : Sequence(genModel::GenCommonBase) {
- return (if null <> diagram.domainDiagramElement then (Sequence { diagram })[genModel::GenCommonBase]->union(getAllSemanticDiagramElements(diagram)) else getAllSemanticDiagramElements(diagram) endif)
+helper getAllSemanticElements(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenCommonBase) {
+ return (if null <> diagram.domainDiagramElement then (Sequence { diagram })[gmfgen::GenCommonBase]->union(getAllSemanticDiagramElements(diagram)) else getAllSemanticDiagramElements(diagram) endif)
}
-helper genModel::GenCommonBase::getMetaClass() : genModel_1::GenClass {
+helper gmfgen::GenCommonBase::getMetaClass() : genmodel::GenClass {
return null
}
-helper genModel::GenDiagram::getMetaClass() : genModel_1::GenClass {
+helper gmfgen::GenDiagram::getMetaClass() : genmodel::GenClass {
return self.domainDiagramElement
}
-helper genModel::GenNode::getMetaClass() : genModel_1::GenClass {
+helper gmfgen::GenNode::getMetaClass() : genmodel::GenClass {
return self.modelFacet.metaClass
}
-helper genModel::GenLink::getMetaClass() : genModel_1::GenClass {
+helper gmfgen::GenLink::getMetaClass() : genmodel::GenClass {
return (if null <> self.modelFacet then self.modelFacet.getMetaClass() else null endif)
}
-helper genModel::LinkModelFacet::getMetaClass() : genModel_1::GenClass {
+helper gmfgen::LinkModelFacet::getMetaClass() : genmodel::GenClass {
return null
}
-helper genModel::TypeLinkModelFacet::getMetaClass() : genModel_1::GenClass {
+helper gmfgen::TypeLinkModelFacet::getMetaClass() : genmodel::GenClass {
return self.metaClass
}
-helper hasSemanticChildren(container : genModel::GenContainerBase) : Boolean {
+helper hasSemanticChildren(container : gmfgen::GenContainerBase) : Boolean {
return not container.sansDomain and not container.containedNodes->isEmpty()
}
-helper genModel::GenContainerBase::getModelElementType() : genModel_1::GenClass {
+helper gmfgen::GenContainerBase::getModelElementType() : genmodel::GenClass {
return null
}
-helper genModel::GenDiagram::getModelElementType() : genModel_1::GenClass {
+helper gmfgen::GenDiagram::getModelElementType() : genmodel::GenClass {
return self.domainDiagramElement
}
-helper genModel::GenCompartment::getModelElementType() : genModel_1::GenClass {
+helper gmfgen::GenCompartment::getModelElementType() : genmodel::GenClass {
return self.node.getModelElementType()
}
-helper genModel::GenNode::getModelElementType() : genModel_1::GenClass {
+helper gmfgen::GenNode::getModelElementType() : genmodel::GenClass {
return self.modelFacet.metaClass
}
-helper getSemanticChildrenChildFeatures(containerBase : genModel::GenContainerBase) : Set(genModel_1::GenFeature) {
+helper getSemanticChildrenChildFeatures(containerBase : gmfgen::GenContainerBase) : Set(genmodel::GenFeature) {
return getNonPhantomSemanticChildren(containerBase)->collect(node | node.modelFacet.childMetaFeature)->asOrderedSet()
}
-helper getSemanticChildrenContainmentFeatures(containerBase : genModel::GenContainerBase) : Set(genModel_1::GenFeature) {
+helper getSemanticChildrenContainmentFeatures(containerBase : gmfgen::GenContainerBase) : Set(genmodel::GenFeature) {
return getNonPhantomSemanticChildren(containerBase)->collect(node | node.modelFacet.containmentMetaFeature)->asOrderedSet()
}
-helper getSemanticChildren(containerBase : genModel::GenContainerBase, childMetaFeature : genModel_1::GenFeature) : Sequence(genModel::GenNode) {
+helper getSemanticChildren(containerBase : gmfgen::GenContainerBase, childMetaFeature : genmodel::GenFeature) : Sequence(gmfgen::GenNode) {
return getNonPhantomSemanticChildren(containerBase)->select(node | node.modelFacet.childMetaFeature = childMetaFeature)
}
-helper getNonPhantomSemanticChildren(containerBase : genModel::GenContainerBase) : Sequence(genModel::GenNode) {
+helper getNonPhantomSemanticChildren(containerBase : gmfgen::GenContainerBase) : Sequence(gmfgen::GenNode) {
return getSemanticChildren(containerBase)->select(node | not node.modelFacet.isPhantomElement())
}
-helper genModel::GenContainerBase::getPhantomNodes() : Sequence(genModel::GenNode) {
+helper gmfgen::GenContainerBase::getPhantomNodes() : Sequence(gmfgen::GenNode) {
return Sequence { }
}
-helper genModel::GenDiagram::getPhantomNodes() : Sequence(genModel::GenNode) {
+helper gmfgen::GenDiagram::getPhantomNodes() : Sequence(gmfgen::GenNode) {
return getSemanticChildren(self)->select(node | node.modelFacet.isPhantomElement())
}
-helper getSemanticChildren(containerBase : genModel::GenContainerBase) : Sequence(genModel::GenNode) {
+helper getSemanticChildren(containerBase : gmfgen::GenContainerBase) : Sequence(gmfgen::GenNode) {
return containerBase.containedNodes->select(node | null <> node.modelFacet)->asSequence()
}
-helper hasConformableSemanticChildren(containerBase : genModel::GenContainerBase) : Boolean {
+helper hasConformableSemanticChildren(containerBase : gmfgen::GenContainerBase) : Boolean {
return let childMetaClasses = getSemanticChildren(containerBase)->collect(node | node.modelFacet.metaClass) in not childMetaClasses->forAll(mc | childMetaClasses->select(mc2 | mc = mc2)->size() = 1)
}
-helper genModel::LinkModelFacet::getLinkEndType(methodNameSuffix : String) : genModel_1::GenClass {
+helper gmfgen::LinkModelFacet::getLinkEndType(methodNameSuffix : String) : genmodel::GenClass {
return null
}
-helper genModel::FeatureLinkModelFacet::getLinkEndType(methodNameSuffix : String) : genModel_1::GenClass {
+helper gmfgen::FeatureLinkModelFacet::getLinkEndType(methodNameSuffix : String) : genmodel::GenClass {
return (if getIncomingLinksMethodNameSuffix() = methodNameSuffix then self.getTargetType() else self.getSourceType() endif)
}
-helper genModel::TypeLinkModelFacet::getLinkEndType(methodNameSuffix : String) : genModel_1::GenClass {
+helper gmfgen::TypeLinkModelFacet::getLinkEndType(methodNameSuffix : String) : genmodel::GenClass {
return (if getIncomingLinksMethodNameSuffix() = methodNameSuffix then self.getTargetType() else (if getOutgoingLinksMethodNameSuffix() = methodNameSuffix and null <> self.sourceMetaFeature then self.getSourceType() else self.containmentMetaFeature.genClass endif) endif)
}
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 4a2666aaa..6dff1d86c 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 49f34316f..f59ca7a99 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«DEFINE extensions FOR gmfgen::GenDiagramUpdater-»
<extension point="org.eclipse.ui.commands" id="update-cmd">
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 ba8bc695c..fc13be188 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
@@ -11,7 +11,7 @@
* Artem Tikhomirov (Borland) - [257119] Create views directly, not through ViewFactories
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 4caf0da89..e56968cb0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::GenEditorGenerator»
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 c6af45b84..c1746dd64 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,9 +9,10 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::editor::Utils»
+«EXTENSION xpt::editor::GenDiagram»
«DEFINE CreationWizard FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
@@ -29,7 +30,7 @@ public class «creationWizardClassName»
«EXPAND xpt::Common::generatedMemberComment»
protected «getCreationWizardPageQualifiedClassName()» diagramModelFilePage;
- «IF isStandaloneDomainModel(self)-»
+ «IF standaloneDomainModel(self)-»
«EXPAND xpt::Common::generatedMemberComment»
protected «getCreationWizardPageQualifiedClassName()» domainModelFilePage;
@@ -83,7 +84,7 @@ public class «creationWizardClassName»
diagramModelFilePage.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForCreationWizardDiagramPage(self))) FOR editorGen»);
diagramModelFilePage.setDescription(«EXPAND xpt::Externalizer::accessorCall(descriptionKey(i18nKeyForCreationWizardDiagramPage(self))) FOR editorGen»);
addPage(diagramModelFilePage);
- «IF isStandaloneDomainModel(self)-»
+ «IF standaloneDomainModel(self)-»
domainModelFilePage = new «getCreationWizardPageQualifiedClassName()»(
"DomainModelFile", getSelection(), "«editorGen.domainFileExtension»") { //$NON-NLS-1$ //$NON-NLS-2$
@@ -119,7 +120,7 @@ public class «creationWizardClassName»
throws InvocationTargetException, InterruptedException {
«ENDIF-»
diagram = «getDiagramEditorUtilQualifiedClassName()».createDiagram(diagramModelFilePage.getURI(),
- «IF isStandaloneDomainModel(self)-»
+ «IF standaloneDomainModel(self)-»
domainModelFilePage.getURI(),
«ENDIF-»
monitor);
@@ -159,8 +160,8 @@ public class «creationWizardClassName»
«DEFINE i18nValues FOR gmfgen::GenDiagram-»
«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreationWizard(self)), 'New ' + editorGen.modelID + ' Diagram')-»
«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreationWizardDiagramPage(self)), 'Create ' + editorGen.modelID + ' Diagram')-»
-«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForCreationWizardDiagramPage(self)), (if isStandaloneDomainModel(self) then 'Select file that will contain diagram model.' else 'Select file that will contain diagram and domain models.' endif))-»
-«IF isStandaloneDomainModel(self)-»
+«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForCreationWizardDiagramPage(self)), (if standaloneDomainModel(self) then 'Select file that will contain diagram model.' else 'Select file that will contain diagram and domain models.' endif))-»
+«IF standaloneDomainModel(self)-»
«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreationWizardDomainPage(self)), 'Create ' + editorGen.modelID + ' Domain Model')-»
«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForCreationWizardDomainPage(self)), 'Select file that will contain domain model.')-»
«ENDIF-»
@@ -172,7 +173,7 @@ public class «creationWizardClassName»
«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreationWizard(self)))-»
«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreationWizardDiagramPage(self)))-»
«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForCreationWizardDiagramPage(self)))-»
- «IF isStandaloneDomainModel(self)-»
+ «IF standaloneDomainModel(self)-»
«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreationWizardDomainPage(self)))-»
«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForCreationWizardDomainPage(self)))-»
«ENDIF-»
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 ef872708e..d28b1e2f6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::editor::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt
index 13b6490a3..6e05f0d7d 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Borland Software Corporation
+ * Copyright (c) 2008, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«DEFINE className FOR gmfgen::GenDiagram»DeleteElementAction«ENDDEFINE»
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 9397e3041..691f1d93d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::diagram::updater::Utils»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt
index b60800bcc..ceb88f601 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Borland Software Corporation
+ * Copyright (c) 2008, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«DEFINE className FOR gmfgen::GenDiagram»DiagramEditorContextMenuProvider«ENDDEFINE»
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 10b8ea2b3..78f20b21c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 5d0cf0b65..c30cb360e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::editor::Utils»
«DEFINE DocumentProvider FOR gmfgen::GenDiagram-»
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 93903cb4e..6db74791a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Editor.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 4481be47b..099947809 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
index 4a355e60b..2efefe54d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
@@ -1,27 +1,39 @@
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
import org.eclipse.gmf.internal.codegen.util.GenModelUtils;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
-modeltype genModel_1 uses "http://www.eclipse.org/emf/2002/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
+modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
library GenDiagram;
-helper standaloneDomainModel(genDiagram : genModel::GenDiagram) : Boolean {
+helper standaloneDomainModel(genDiagram : gmfgen::GenDiagram) : Boolean {
return not genDiagram.editorGen.sameFileForDiagramAndModel and genDiagram.domainDiagramElement <> null
}
-helper hasDocumentRoot(genDiagram : genModel::GenDiagram) : Boolean {
+helper hasDocumentRoot(genDiagram : gmfgen::GenDiagram) : Boolean {
return getDocumentRoot(genDiagram) <> null
}
-helper getDocumentRoot(genDiagram : genModel::GenDiagram) : genModel_1::GenClass {
+helper getDocumentRoot(genDiagram : gmfgen::GenDiagram) : genmodel::GenClass {
return (if genDiagram.domainDiagramElement = null then null else getDocumentRoot(genDiagram.domainDiagramElement.genPackage) endif)
}
-helper getDocumentRootSetFeature(genDiagram : genModel::GenDiagram) : genModel_1::GenFeature {
+helper getDocumentRootSetFeature(genDiagram : gmfgen::GenDiagram) : genmodel::GenFeature {
return getDocumentRoot(genDiagram).genFeatures->select(f | isDocRootSetFeature(f, genDiagram.domainDiagramElement.ecoreClass))->first()
}
-helper isDocRootSetFeature(gf : genModel_1::GenFeature, eType : ecore::EClass) : Boolean {
+helper isDocRootSetFeature(gf : genmodel::GenFeature, eType : ecore::EClass) : Boolean {
return not isListType(gf) and gf.ecoreFeature.changeable and (-2 = gf.ecoreFeature.upperBound.oclAsType(Integer) and (gf.ecoreFeature.eClass().name = 'EReference' and gf.ecoreFeature.eType.oclAsType(ecore::EClass).isSuperTypeOf(eType)))
}
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 84536f72d..1c0c5c730 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - rewritten in xpand
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::editor::Utils»
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 6e7a81455..c47189a83 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 397b50fa8..b1ec18ce9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 e71bd7fdb..374c94f6e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - rewritten in xpand
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 c5bb5b25d..ed33e3ad1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 673974d78..ab45b388e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 2eba54561..febab6d54 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 a71ad737a..92bec2eb3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 1501222c2..f8f301afa 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«DEFINE UriEditorInputTester FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.qvto
index 3891b3bfa..a1d7332d0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.qvto
@@ -1,120 +1,128 @@
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexander Shatalin (Borland) - initial API and implementation
+ */
+
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library Utils;
-helper isStandaloneDomainModel(diagram : genModel::GenDiagram) : Boolean {
- return not diagram.editorGen.sameFileForDiagramAndModel and null <> diagram.domainDiagramElement
-}
-
-helper hasNavigator(editorView : genModel::GenEditorView) : Boolean {
+helper hasNavigator(editorView : gmfgen::GenEditorView) : Boolean {
return null <> editorView.editorGen.navigator
}
-helper addGotoMarker(editorView : genModel::GenEditorView, implementsList : Sequence(String)) : Sequence(String) {
+helper addGotoMarker(editorView : gmfgen::GenEditorView, implementsList : Sequence(String)) : Sequence(String) {
return (if isIDEMode(editorView) then implementsList->including('org.eclipse.ui.ide.IGotoMarker') else implementsList endif)
}
-helper isIDEMode(editorView : genModel::GenEditorView) : Boolean {
+helper isIDEMode(editorView : gmfgen::GenEditorView) : Boolean {
return null = editorView.editorGen.application
}
-helper addReadOnlyPropSheet(editorView : genModel::GenEditorView, implementsList : Sequence(String)) : Sequence(String) {
+helper addReadOnlyPropSheet(editorView : gmfgen::GenEditorView, implementsList : Sequence(String)) : Sequence(String) {
return (if hasPropertySheet(editorView) and editorView.editorGen.propertySheet.readOnly then implementsList->including('org.eclipse.gmf.runtime.diagram.ui.properties.views.IReadOnlyDiagramPropertySheetPageContributor') else implementsList endif)
}
-helper hasPropertySheet(editorView : genModel::GenEditorView) : Boolean {
+helper hasPropertySheet(editorView : gmfgen::GenEditorView) : Boolean {
return null <> editorView.editorGen.propertySheet
}
-helper getEditorImplementsList(editorView : genModel::GenEditorView) : Sequence(String) {
+helper getEditorImplementsList(editorView : gmfgen::GenEditorView) : Sequence(String) {
return addGotoMarker(editorView, addReadOnlyPropSheet(editorView, Sequence { }))
}
-helper getContainedSemanticNodes(container : genModel::GenContainerBase) : Sequence(genModel::GenNode) {
+helper getContainedSemanticNodes(container : gmfgen::GenContainerBase) : Sequence(gmfgen::GenNode) {
return container.containedNodes->select(node | null <> node.modelFacet)->asSequence()
}
-helper genModel::GenCommonBase::getEssentialVisualChildren() : Collection(genModel::GenCommonBase) {
+helper gmfgen::GenCommonBase::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
return Sequence { }
}
-helper genModel::GenLink::getEssentialVisualChildren() : Collection(genModel::GenCommonBase) {
+helper gmfgen::GenLink::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
return self.labels
}
-helper genModel::GenContainerBase::getEssentialVisualChildren() : Collection(genModel::GenCommonBase) {
+helper gmfgen::GenContainerBase::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
return self.containedNodes
}
-helper genModel::GenNode::getEssentialVisualChildren() : Collection(genModel::GenCommonBase) {
- return ((Sequence { })[genModel::GenNodeLabel]->union(self.labels->asSequence()))[genModel::GenCommonBase]->union(self.compartments->asSequence())->union(self.containedNodes->asSequence())
+helper gmfgen::GenNode::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
+ return ((Sequence { })[gmfgen::GenNodeLabel]->union(self.labels->asSequence()))[gmfgen::GenCommonBase]->union(self.compartments->asSequence())->union(self.containedNodes->asSequence())
}
-helper defaultShortcutCreationWizardClassName(diagram : genModel::GenDiagram) : String {
+helper defaultShortcutCreationWizardClassName(diagram : gmfgen::GenDiagram) : String {
return 'ShortcutCreationWizard'
}
-helper defaultModelElementSelectionPageClassName(diagram : genModel::GenDiagram) : String {
+helper defaultModelElementSelectionPageClassName(diagram : gmfgen::GenDiagram) : String {
return 'ModelElementSelectionPage'
}
-helper defaultValidateActionClassName(diagram : genModel::GenDiagram) : String {
+helper defaultValidateActionClassName(diagram : gmfgen::GenDiagram) : String {
return 'ValidateAction'
}
-helper i18nKeyForDocumentProvider(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentProvider(diagram : gmfgen::GenDiagram) : String {
return diagram.documentProviderClassName
}
-helper i18nKeyForDocumentProviderIsModifiable(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentProviderIsModifiable(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '_isModifiable'
}
-helper i18nKeyForDocumentProviderHandleElementContentChanged(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentProviderHandleElementContentChanged(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '_handleElementContentChanged'
}
-helper i18nKeyForDocumentProviderIncorrectInputError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentProviderIncorrectInputError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.IncorrectInputError'
}
-helper i18nKeyForDocumentProviderNoDiagramInResourceError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentProviderNoDiagramInResourceError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.NoDiagramInResourceError'
}
-helper i18nKeyForDocumentProviderDiagramLoadingError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentProviderDiagramLoadingError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.DiagramLoadingError'
}
-helper i18nKeyForDocumentUnsynchronizedFileSaveError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentUnsynchronizedFileSaveError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.UnsynchronizedFileSaveError'
}
-helper i18nKeyForDocumentSaveDiagramTask(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentSaveDiagramTask(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.SaveDiagramTask'
}
-helper i18nKeyForDocumentSaveNextResourceTask(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentSaveNextResourceTask(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.SaveNextResourceTask'
}
-helper i18nKeyForDocumentSaveAs(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDocumentSaveAs(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDocumentProvider(diagram) + '.SaveAsOperation'
}
-helper i18nKeyForDiagramEditorUtil(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForDiagramEditorUtil(diagram : gmfgen::GenDiagram) : String {
return diagram.diagramEditorUtilClassName
}
-helper i18nKeyForOpenModelResourceErrorDialog(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForOpenModelResourceErrorDialog(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDiagramEditorUtil(diagram) + '.OpenModelResourceErrorDialog'
}
-helper i18nKeyForCreateDiagramProgressTask(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreateDiagramProgressTask(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDiagramEditorUtil(diagram) + '.CreateDiagramProgressTask'
}
-helper i18nKeyForCreateDiagramCommandLabel(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreateDiagramCommandLabel(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForDiagramEditorUtil(diagram) + '.CreateDiagramCommandLabel'
}
@@ -130,59 +138,59 @@ helper i18nKeyForInitDiagramOpenFileDialogTitle() : String {
return 'InitDiagramFile.OpenModelFileDialogTitle'
}
-helper i18nKeyForNewDiagramFileWizard(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizard(diagram : gmfgen::GenDiagram) : String {
return diagram.newDiagramFileWizardClassName
}
-helper i18nKeyForNewDiagramFileWizardCreationPage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardCreationPage(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizard(diagram) + '.CreationPage'
}
-helper i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizard(diagram) + '.RootSelectionPage'
}
-helper i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram) + 'SelectionTitle'
}
-helper i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram) + 'NoSelectionMessage'
}
-helper i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram) + 'InvalidSelectionMessage'
}
-helper i18nKeyForNewDiagramFileWizardInitDiagramCommand(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardInitDiagramCommand(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizard(diagram) + '.InitDiagramCommand'
}
-helper i18nKeyForNewDiagramFileWizardIncorrectRootError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForNewDiagramFileWizardIncorrectRootError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForNewDiagramFileWizard(diagram) + '.IncorrectRootError'
}
-helper i18nKeyForSavingDeletedFile(editor : genModel::GenEditorView) : String {
+helper i18nKeyForSavingDeletedFile(editor : gmfgen::GenEditorView) : String {
return i18nKeyForEditor(editor) + '.SavingDeletedFile'
}
-helper i18nKeyForSaveAsProblems(editor : genModel::GenEditorView) : String {
+helper i18nKeyForSaveAsProblems(editor : gmfgen::GenEditorView) : String {
return i18nKeyForEditor(editor) + '.SaveAsError'
}
-helper i18nKeyForSaveProblems(editor : genModel::GenEditorView) : String {
+helper i18nKeyForSaveProblems(editor : gmfgen::GenEditorView) : String {
return i18nKeyForEditor(editor) + '.SaveError'
}
-helper i18nKeyForEditor(editor : genModel::GenEditorView) : String {
+helper i18nKeyForEditor(editor : gmfgen::GenEditorView) : String {
return editor.className
}
-helper i18nKeyForSelectModelElement(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForSelectModelElement(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForElementChooser(diagram) + '.SelectModelElement'
}
-helper i18nKeyForElementChooser(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForElementChooser(diagram : gmfgen::GenDiagram) : String {
return diagram.elementChooserClassName
}
@@ -194,47 +202,47 @@ helper i18nKeyForCreateShortcutWizard() : String {
return 'CreateShortcutAction.Wizard'
}
-helper i18nKeyForShortcutWizardReferencedElementPage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForShortcutWizardReferencedElementPage(diagram : gmfgen::GenDiagram) : String {
return defaultShortcutCreationWizardClassName(diagram) + '.ReferencedElementSelectionPage'
}
-helper i18nKeyForModelElementSelectionPage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForModelElementSelectionPage(diagram : gmfgen::GenDiagram) : String {
return defaultModelElementSelectionPageClassName(diagram)
}
-helper i18nKeyForValidateAction(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForValidateAction(diagram : gmfgen::GenDiagram) : String {
return defaultValidateActionClassName(diagram)
}
-helper i18nKeyForShortcutWizardReferencedElementPageEmptyError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForShortcutWizardReferencedElementPageEmptyError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForShortcutWizardReferencedElementPage(diagram) + 'EmptyError'
}
-helper i18nKeyForShortcutWizardReferencedElementPageInvalidError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForShortcutWizardReferencedElementPageInvalidError(diagram : gmfgen::GenDiagram) : String {
return i18nKeyForShortcutWizardReferencedElementPage(diagram) + 'InvalidError'
}
-helper i18nKeyForCreationWizard(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreationWizard(diagram : gmfgen::GenDiagram) : String {
return diagram.creationWizardClassName
}
-helper i18nKeyForCreationWizardDiagramPage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreationWizardDiagramPage(diagram : gmfgen::GenDiagram) : String {
return diagram.creationWizardClassName + '.DiagramModelFilePage'
}
-helper i18nKeyForCreationWizardDomainPage(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreationWizardDomainPage(diagram : gmfgen::GenDiagram) : String {
return diagram.creationWizardClassName + '.DomainModelFilePage'
}
-helper i18nKeyForCreationWizardOpenEditorError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreationWizardOpenEditorError(diagram : gmfgen::GenDiagram) : String {
return diagram.creationWizardClassName + 'OpenEditorError'
}
-helper i18nKeyForCreationWizardCreationError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreationWizardCreationError(diagram : gmfgen::GenDiagram) : String {
return diagram.creationWizardClassName + 'CreationError'
}
-helper i18nKeyForCreationWizardPageExtensionError(diagram : genModel::GenDiagram) : String {
+helper i18nKeyForCreationWizardPageExtensionError(diagram : gmfgen::GenDiagram) : String {
return diagram.creationWizardPageClassName + 'ExtensionError'
}
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 5914f7df0..d8123bf84 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 b2b938e16..8c49a0afd 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 79c072420..07b9fa114 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
index a4c3889bf..614e76127 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 5d43d2606..8b0efbd42 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.qvto
index b7f133e41..37060a890 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.qvto
@@ -1,49 +1,61 @@
+/*
+ * Copyright (c) 2006, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
import xpt.StringOperations;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library Utils;
-helper genModel::Palette::activatorFQN() : String {
+helper gmfgen::Palette::activatorFQN() : String {
return self.diagram.editorGen.plugin.getActivatorQualifiedClassName()
}
-helper genModel::AbstractToolEntry::activatorFQN() : String {
+helper gmfgen::AbstractToolEntry::activatorFQN() : String {
return self.group.palette.activatorFQN()
}
-helper genModel::ToolGroup::activatorFQN() : String {
+helper gmfgen::ToolGroup::activatorFQN() : String {
return self.palette.activatorFQN()
}
-helper i18nKey(group : genModel::EntryBase) : String {
+helper i18nKey(group : gmfgen::EntryBase) : String {
return let rv = group.createMethodName in (if rv.xpandStartsWith('get') then rv.xpandSubstring(3) else (if rv.xpandStartsWith('create') then rv.xpandSubstring(6) else rv endif) endif)
}
-helper i18nTitleKey(group : genModel::EntryBase) : String {
+helper i18nTitleKey(group : gmfgen::EntryBase) : String {
return i18nKey(group) + '_title'
}
-helper i18nDescKey(group : genModel::EntryBase) : String {
+helper i18nDescKey(group : gmfgen::EntryBase) : String {
return i18nKey(group) + '_desc'
}
-helper collectGroups(palette : genModel::Palette) : Sequence(genModel::ToolGroup) {
+helper collectGroups(palette : gmfgen::Palette) : Sequence(gmfgen::ToolGroup) {
return palette.groups->asSequence()->union(palette.groups->collect(it | collectSubGroups(it)))->asOrderedSet()->asSequence()
}
-helper collectSubGroups(group : genModel::ToolGroup) : Sequence(genModel::ToolGroup) {
- return let rv = (group.entries)[genModel::ToolGroup] in rv->union(rv->collect(g | collectSubGroups(g))->flatten()->asSet())->asSequence()
+helper collectSubGroups(group : gmfgen::ToolGroup) : Sequence(gmfgen::ToolGroup) {
+ return let rv = (group.entries)[gmfgen::ToolGroup] in rv->union(rv->collect(g | collectSubGroups(g))->flatten()->asSet())->asSequence()
}
-helper collectTools(palette : genModel::Palette) : Sequence(genModel::AbstractToolEntry) {
- return collectGroups(palette)->collect(g | (g.entries)[genModel::AbstractToolEntry])->flatten()
+helper collectTools(palette : gmfgen::Palette) : Sequence(gmfgen::AbstractToolEntry) {
+ return collectGroups(palette).entries[gmfgen::AbstractToolEntry]
}
-helper needsNodeToolEntryClass(palette : genModel::Palette) : Boolean {
- return (collectTools(palette))[genModel::ToolEntry]->exists(e | not e.genNodes->isEmpty())
+helper needsNodeToolEntryClass(palette : gmfgen::Palette) : Boolean {
+ return collectTools(palette)[gmfgen::ToolEntry]->exists(genNodes->notEmpty())
}
-helper needsLinkToolEntryClass(palette : genModel::Palette) : Boolean {
- return (collectTools(palette))[genModel::ToolEntry]->exists(e | not e.genLinks->isEmpty())
+helper needsLinkToolEntryClass(palette : gmfgen::Palette) : Boolean {
+ return collectTools(palette)[gmfgen::ToolEntry]->exists(genLinks->notEmpty())
}
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 47f7a0866..d1c3ec074 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 5d96611e0..57be9f6a6 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 42c3c6f16..7031414d1 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.qvto
index 15a65f053..9389b45d2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/ValueExpression.qvto
@@ -1,15 +1,27 @@
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+/*
+ * Copyright (c) 2008, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library ValueExpression;
-helper constraintFieldName(cb : genModel::GenCommonBase) : String {
+helper constraintFieldName(cb : gmfgen::GenCommonBase) : String {
return cb.getUniqueIdentifier() + '_Constraint'
}
-helper sourceConstraintFieldName(l : genModel::GenLink) : String {
+helper sourceConstraintFieldName(l : gmfgen::GenLink) : String {
return l.getUniqueIdentifier() + '_SourceExpression'
}
-helper targetConstraintFieldName(l : genModel::GenLink) : String {
+helper targetConstraintFieldName(l : gmfgen::GenLink) : String {
return l.getUniqueIdentifier() + '_TargetExpression'
}
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 abb1d699a..af90262db 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 50511d162..939c8832d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 df4a887f9..301286b3b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 456459aba..2d83472cb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 325c52700..c5ec539f7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 0a2bc7993..58ba11df4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006,2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 9e8a05070..35d21a2f7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006,2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«EXTENSION xpt::navigator::Utils»
«EXTENSION org::eclipse::gmf::internal::codegen::util::CodeGenerationUtils»
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 2a05b29cf..67eb34294 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 fca531c27..0ba768ba3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 4f2d3510b..3ea94dd86 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 a27c573ad..82387adeb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 c629b7227..86b5eeac7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006,2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::navigator::Utils»
«DEFINE NavigatorSorter FOR gmfgen::GenNavigator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.qvto
index d586c035f..e1ea3f6dc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.qvto
@@ -1,6 +1,18 @@
+/*
+ * Copyright (c) 2006, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexander Shatalin (Borland) - initial API and implementation
+ */
+
import org.eclipse.gmf.internal.codegen.util.CodeGenerationUtils;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype genModel uses "http://www.eclipse.org/gmf/2009/GenModel";
modeltype genModel_1 uses "http://www.eclipse.org/emf/2002/GenModel";
library Utils;
@@ -9,10 +21,12 @@ helper getMaxVisualID(navigator : genModel::GenNavigator) : Integer {
return (if getMaxVisualIDNavigatorNode(navigator)->size() = 1 then getMaxVisualIDNavigatorNode(navigator)->first().oclAsType(genModel::GenCommonBase).visualID else 0 endif)
}
+-- MODIFIERS: private cached
helper getMaxVisualIDNavigatorNode(navigator : genModel::GenNavigator) : Sequence(genModel::GenCommonBase) {
return getNavigatorNodes(navigator)->select(navigatorNode | isMaximumVisualID(navigatorNode, getNavigatorNodes(navigator)))
}
+-- MODIFIERS: private
helper isMaximumVisualID(commonBase : genModel::GenCommonBase, allNavigatorNodes : Sequence(genModel::GenCommonBase)) : Boolean {
return allNavigatorNodes->select(navigatorNode | navigatorNode.visualID > commonBase.visualID)->isEmpty()
}
@@ -21,14 +35,17 @@ helper isStringFeature(feature : genModel_1::GenFeature) : Boolean {
return feature.ecoreFeature.eType.name = 'EString'
}
+-- MODIFIERS: cached
helper getNavigatorContainerNodes(navigator : genModel::GenNavigator) : Sequence(genModel::GenCommonBase) {
return getNavigatorNodes(navigator)->select(n | getChildReferencesFrom(navigator, n)->size() > 0)
}
+-- MODIFIERS: cached
helper getNavigatorContainedNodes(navigator : genModel::GenNavigator) : Sequence(genModel::GenCommonBase) {
return getNavigatorNodes(navigator)->select(n | getChildReferencesTo(navigator, n)->size() > 0)
}
+-- MODIFIERS: private
helper getNavigatorNodes(navigator : genModel::GenNavigator) : Sequence(genModel::GenCommonBase) {
return let diagram = navigator.editorGen.diagram in (((Sequence { diagram })[genModel::GenContainerBase]->union(diagram.topLevelNodes->asSequence())->union(diagram.childNodes->asSequence()))[genModel::GenCommonBase]->union(diagram.links->asSequence())->union(diagram.compartments->asSequence()))[genModel::GenCommonBase]
}
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 b82d0a660..7993678eb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 ccf0ec4e2..963805bad 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«DEFINE getEditorInput FOR gmfgen::GenEditorGenerator-»
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 57f44db3e..d1d2fe891 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/Activator.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 2249cefec..056d2feca 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/build.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 c762e3598..b6f14eea6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/manifest.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 18b90dad7..26253e3d1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/options.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 7747314a1..8af25a0e9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/plugin.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 d643e1e55..2c0014736 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin/properties.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 35ea4c54e..fb23ba290 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 29c0729dd..7e71cf488 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 0379b45b7..f0b67d6b3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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/EditPartProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
index 68daef73e..56928264e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«DEFINE EditPartProvider FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto
index 48fe4242b..998578414 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto
@@ -1,78 +1,58 @@
+/*
+ * Copyright (c) 2008, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
import xpt.GenModelUtils;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
-modeltype genModel_1 uses "http://www.eclipse.org/emf/2002/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
+modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
library ElementInitializers;
-helper genModel_1::GenClassifier::expressionResultNeedsCast() : Boolean {
- return false
-}
-
-helper genModel_1::GenClass::expressionResultNeedsCast() : Boolean {
- return false
-}
-
-helper genModel_1::GenDataType::expressionResultNeedsCast() : Boolean {
- return self.isNumberObject() or self.isPrimitiveNumberType()
-}
+helper genmodel::GenClassifier::expressionResultNeedsCast() : Boolean { return false }
+helper genmodel::GenClass::expressionResultNeedsCast() : Boolean { return false }
+helper genmodel::GenDataType::expressionResultNeedsCast() : Boolean { return self.isNumberObject() or self.isPrimitiveNumberType() }
+helper genmodel::GenEnum::expressionResultNeedsCast() : Boolean { return true }
-helper genModel_1::GenEnum::expressionResultNeedsCast() : Boolean {
- return true
-}
-
-helper javaMethodName(de : genModel::GenCommonBase, valueSpec : genModel::GenFeatureValueSpec) : String {
+helper javaMethodName(de : gmfgen::GenCommonBase, valueSpec : gmfgen::GenFeatureValueSpec) : String {
return valueSpec.feature.ecoreFeature.name + '_' + de.getUniqueIdentifier()
}
-helper recurseCollectValueSpec(si : genModel::GenFeatureSeqInitializer) : Sequence(genModel::GenFeatureValueSpec) {
- return (si.initializers)[genModel::GenFeatureValueSpec]->asSequence()->union((si.initializers)[genModel::GenReferenceNewElementSpec].newElementInitializers->collect(it | recurseCollectValueSpec(it))->flatten())->asOrderedSet()->asSequence()
+helper recurseCollectValueSpec(si : gmfgen::GenFeatureSeqInitializer) : Sequence(gmfgen::GenFeatureValueSpec) {
+ return si.initializers[gmfgen::GenFeatureValueSpec]->union(si.initializers[gmfgen::GenReferenceNewElementSpec].newElementInitializers->collect(it | recurseCollectValueSpec(it))->asOrderedSet())->asSequence()
}
helper getSuffixes(newSuffix : Integer) : Sequence(Integer) {
- return ((Sequence { })[Integer]->including(newSuffix))[Integer]
+ return Sequence { newSuffix }
}
helper getSuffixes(suffixes : Sequence(Integer), newSuffix : Integer) : Sequence(Integer) {
- return ((Sequence { })[Integer]->union(suffixes)->including(newSuffix))[Integer]
+ return suffixes->including(newSuffix)
}
helper getVariableName(prefix : String, suffixes : Sequence(Integer)) : String {
return prefix + getSuffix(suffixes)
}
-helper genModel_1::GenClassifier::isNumberObject() : Boolean {
- return false
-}
-
-helper genModel_1::GenClass::isNumberObject() : Boolean {
- return false
-}
-
-helper genModel_1::GenDataType::isNumberObject() : Boolean {
- return Sequence { 'java.math.BigDecimal', 'java.math.BigInteger', 'java.lang.Byte', 'java.lang.Double', 'java.lang.Float', 'java.lang.Integer', 'java.lang.Long', 'java.lang.Short' }->includes(self.ecoreDataType.instanceClassName)
-}
-
-helper genModel_1::GenEnum::isNumberObject() : Boolean {
- return false
-}
-
-helper genModel_1::GenClassifier::isPrimitiveNumberType() : Boolean {
- return false
-}
+-- privates
+helper genmodel::GenClassifier::isNumberObject() : Boolean { return false }
+helper genmodel::GenClass::isNumberObject() : Boolean { return false }
+helper genmodel::GenDataType::isNumberObject() : Boolean { return Sequence { 'java.math.BigDecimal', 'java.math.BigInteger', 'java.lang.Byte', 'java.lang.Double', 'java.lang.Float', 'java.lang.Integer', 'java.lang.Long', 'java.lang.Short' }->includes(self.ecoreDataType.instanceClassName) }
+helper genmodel::GenEnum::isNumberObject() : Boolean { return false }
-helper genModel_1::GenClass::isPrimitiveNumberType() : Boolean {
- return false
-}
-
-helper genModel_1::GenDataType::isPrimitiveNumberType() : Boolean {
- return Sequence { 'byte', 'double', 'float', 'int', 'long', 'short' }->includes(self.ecoreDataType.instanceClassName)
-}
-
-helper genModel_1::GenEnum::isPrimitiveNumberType() : Boolean {
- return false
-}
+helper genmodel::GenClassifier::isPrimitiveNumberType() : Boolean { return false }
+helper genmodel::GenClass::isPrimitiveNumberType() : Boolean { return false }
+helper genmodel::GenDataType::isPrimitiveNumberType() : Boolean { return Sequence { 'byte', 'double', 'float', 'int', 'long', 'short' }->includes(self.ecoreDataType.instanceClassName) }
+helper genmodel::GenEnum::isPrimitiveNumberType() : Boolean { return false }
helper getSuffix(suffixes : Sequence(Integer)) : String {
- return '_' + suffixes->first().repr() + (if suffixes->size() > 1 then getSuffix((let tmpVar = suffixes in if tmpVar->size() < 2 then Sequence{}[Integer] else tmpVar->subSequence(2, tmpVar->size()) endif)[Integer]) else '' endif)
+ return '_' + suffixes->first().repr() + (if suffixes->size() > 1 then getSuffix(suffixes->subSequence(2, suffixes->size())) else '' endif)
}
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 42f1ba7a9..367e38dcc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -14,7 +14,7 @@
*/
«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
«EXTENSION xpt::providers::ElementInitializers»
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 6f4f07ee9..5da49e2fc 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/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 43493d77e..d07e38ef9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/IconProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 4c99ec092..06e2c0ddc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 dc97ae4a5..d319bff2e 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
* Artem Tikhomirov (Borland) - refactoring (https://bugs.eclipse.org/230014)
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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/Metrics.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.qvto
index 10d481cac..40cd8507b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/Metrics.qvto
@@ -1,26 +1,41 @@
+/*
+ * Copyright (c) 2008, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Artem Tikhomirov (Borland) - initial API and implementation
+ */
+
import org.eclipse.gmf.internal.codegen.util.CodeGenerationUtils;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library Metrics;
-helper getNotationMetrics(c : genModel::GenMetricContainer) : Sequence(genModel::GenMetricRule) {
- return c.metrics->select(m | not (Sequence { m.target })[genModel::GenNotationElementTarget]->isEmpty())->asSequence()
+-- MODIFIERS: cached
+helper getNotationMetrics(c : gmfgen::GenMetricContainer) : Sequence(gmfgen::GenMetricRule) {
+ return c.metrics->select(target.oclIsKindOf(gmfgen::GenNotationElementTarget))
}
-helper getDiagramMetrics(c : genModel::GenMetricContainer) : Sequence(genModel::GenMetricRule) {
- return c.metrics->select(m | not (Sequence { m.target })[genModel::GenDiagramElementTarget]->isEmpty())->asSequence()
+-- MODIFIERS: cached
+helper getDiagramMetrics(c : gmfgen::GenMetricContainer) : Sequence(gmfgen::GenMetricRule) {
+ return c.metrics->select(target.oclIsKindOf(gmfgen::GenDiagramElementTarget))
}
-helper getDomainMetrics(c : genModel::GenMetricContainer) : Sequence(genModel::GenMetricRule) {
- return c.metrics->select(m | not (Sequence { m.target })[genModel::GenDomainElementTarget]->isEmpty())->asSequence()
+-- MODIFIERS: cached
+helper getDomainMetrics(c : gmfgen::GenMetricContainer) : Sequence(gmfgen::GenMetricRule) {
+ return c.metrics->select(target.oclIsKindOf(gmfgen::GenDomainElementTarget))
}
-helper exprFieldName(m : genModel::GenMetricRule) : String {
+helper exprFieldName(m : gmfgen::GenMetricRule) : String {
return 'expression' + validJavaIdentifier(m.key).firstToUpper()
}
-helper calcMethodName(m : genModel::GenMetricRule) : String {
+helper calcMethodName(m : gmfgen::GenMetricRule) : String {
return 'calc' + validJavaIdentifier(m.key).firstToUpper()
}
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 5a1146a32..d9e6f77ef 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -11,7 +11,7 @@
* Artem Tikhomirov (Borland) - refactoring (https://bugs.eclipse.org/230014)
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 91376a798..9e327ba88 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
@@ -11,7 +11,7 @@
* Michael Golubev (Borland) - #244970 (GenChildLabelNode can't be link's source/target)
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::diagram::editparts::Utils»
«EXTENSION xpt::providers::i18n»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.qvto
index 5958104c8..b85a0335d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ParserUtils.qvto
@@ -1,17 +1,29 @@
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Dmitry Stadnik (Borland) - initial API and implementation
+ */
+
import xpt.StringOperations;
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
library ParserUtils;
-helper parserFieldName(element : genModel::GenCommonBase) : String {
+helper parserFieldName(element : gmfgen::GenCommonBase) : String {
return element.getUniqueIdentifier().xpandToFirstLower() + 'Parser'
}
-helper parserAccessorName(element : genModel::GenCommonBase) : String {
+helper parserAccessorName(element : gmfgen::GenCommonBase) : String {
return 'get' + element.getUniqueIdentifier().firstToUpper() + 'Parser'
}
helper isPatternSpecified(pattern : String) : Boolean {
- return pattern <> null and pattern.xpandLength() > 0
+ return (not pattern.oclIsUndefined()) and pattern.size() > 0
}
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 11c9dddbc..c57fcd29b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006,2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 96bdd1697..7517cfd59 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 087747ee6..bbf74662a 100755
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008 Borland Software Corporation
+ * Copyright (c) 2007, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -12,7 +12,7 @@
* straightforward and simple #validate() implementation
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
«EXTENSION xpt::GenModelUtils»
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 539aa7536..4dcdfb52f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
@@ -11,7 +11,7 @@
* Artem Tikhomirov (Borland) - [257119] Create views directly, not through ViewFactories
*/
-«IMPORT 'http://www.eclipse.org/gmf/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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 2475edde8..255f36580 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/2008/GenModel'»
+«IMPORT 'http://www.eclipse.org/gmf/2009/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.qvto b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.qvto
index 020e3ceb7..288db8ded 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.qvto
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/providers/i18n.qvto
@@ -1,15 +1,19 @@
-modeltype genModel uses "http://www.eclipse.org/gmf/2008/GenModel";
+/*
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Anna Karjakina (Borland) - initial API and implementation
+ */
-library i18n;
-
-helper i18nKeyForModelingAssistantProvider(diagram : genModel::GenDiagram) : String {
- return diagram.modelingAssistantProviderClassName
-}
+modeltype gmfgen uses "http://www.eclipse.org/gmf/2009/GenModel";
-helper titleKey(dialogKey : String) : String {
- return dialogKey + 'Title'
-}
+library i18n;
-helper messageKey(dialogKey : String) : String {
- return dialogKey + 'Message'
-}
+helper i18nKeyForModelingAssistantProvider(diagram : gmfgen::GenDiagram) : String { return diagram.modelingAssistantProviderClassName }
+helper titleKey(dialogKey : String) : String { return dialogKey + 'Title' }
+helper messageKey(dialogKey : String) : String { return dialogKey + 'Message' }

Back to the top