Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2009-03-17 17:22:29 -0400
committeratikhomirov2009-03-17 17:22:29 -0400
commit50c9fa2af60c306a6b74418c4cf53d3d84969416 (patch)
tree5dc426b549e4ebacac5d80006291f62254d6f5a6 /plugins/org.eclipse.gmf.codegen/templates/xpt/editor
parentdae5d8c42e6a40d4eeddcce38f220f25b3eaeb65 (diff)
downloadorg.eclipse.gmf-tooling-50c9fa2af60c306a6b74418c4cf53d3d84969416.tar.gz
org.eclipse.gmf-tooling-50c9fa2af60c306a6b74418c4cf53d3d84969416.tar.xz
org.eclipse.gmf-tooling-50c9fa2af60c306a6b74418c4cf53d3d84969416.zip
[268990] update gmfgen with new nsURI to reflect changes in 2.2 stream
Diffstat (limited to 'plugins/org.eclipse.gmf.codegen/templates/xpt/editor')
-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
27 files changed, 169 insertions, 136 deletions
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())
}

Back to the top