Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2007-05-18 17:17:17 -0400
committeratikhomirov2007-05-18 17:17:17 -0400
commit54296d34fad601ba16bb2bfb0ca3d72c030327bc (patch)
treed8276f8cbbf6a89398fe85509db03afb9668ca6f
parent2f0ac6ad7ee96ad9738deefc0cea2e5e51b5d75a (diff)
downloadorg.eclipse.gmf-tooling-54296d34fad601ba16bb2bfb0ca3d72c030327bc.tar.gz
org.eclipse.gmf-tooling-54296d34fad601ba16bb2bfb0ca3d72c030327bc.tar.xz
org.eclipse.gmf-tooling-54296d34fad601ba16bb2bfb0ca3d72c030327bc.zip
switching to nsURI format which uses year to denote model version (same way EMF does)
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore2
-rw-r--r--plugins/org.eclipse.gmf.codegen/plugin.xml2
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java2
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java8
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenResource.java1
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ChildNodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/CompartmentEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/DiagramEditPart.xpt54
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ExternalNodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeLabelEditPart.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/TextAware.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext7
-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.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ElementTypes.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/MarkerNavigationProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserUtils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ValidationDecoratorProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/javaExpressionOperation.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/manifest.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/plugin.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/properties.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt2
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt2
115 files changed, 173 insertions, 119 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
index 0349fe165..1bf3a6e36 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
@@ -2,7 +2,7 @@
<ecore:EPackage xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="gmfgen"
- nsURI="http://www.eclipse.org/gmf/2005/GenModel/2.0" nsPrefix="gmfgen">
+ nsURI="http://www.eclipse.org/gmf/2006/GenModel" nsPrefix="gmfgen">
<eAnnotations source="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap">
<details key="constraints" value="http://www.eclipse.org/gmf/2005/constraints"/>
<details key="meta" value="http://www.eclipse.org/gmf/2005/constraints/meta"/>
diff --git a/plugins/org.eclipse.gmf.codegen/plugin.xml b/plugins/org.eclipse.gmf.codegen/plugin.xml
index bb5d872ea..eed9aaad9 100644
--- a/plugins/org.eclipse.gmf.codegen/plugin.xml
+++ b/plugins/org.eclipse.gmf.codegen/plugin.xml
@@ -8,7 +8,7 @@
class = "org.eclipse.gmf.codegen.gmfgen.GMFGenPackage"
genModel = "models/gmfgen.genmodel" />
<package
- uri = "http://www.eclipse.org/gmf/2005/GenModel/2.0"
+ uri = "http://www.eclipse.org/gmf/2006/GenModel"
class = "org.eclipse.gmf.codegen.gmfgen.GMFGenPackage"
genModel = "models/gmfgen.genmodel" />
</extension>
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
index 7bd0419c5..5b60ffc2b 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
@@ -44,7 +44,7 @@ public interface GMFGenPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+ String eNS_URI = "http://www.eclipse.org/gmf/2006/GenModel";
/**
* The package namespace name.
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
index 74ed456a2..bde3c42dd 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
@@ -80,7 +80,7 @@ public class GMFGenFactoryImpl extends EFactoryImpl implements GMFGenFactory {
*/
public static GMFGenFactory init() {
try {
- GMFGenFactory theGMFGenFactory = (GMFGenFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/2005/GenModel/2.0");
+ GMFGenFactory theGMFGenFactory = (GMFGenFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/2006/GenModel");
if (theGMFGenFactory != null) {
return theGMFGenFactory;
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
index 77fe50028..4aa4e3ad4 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
@@ -7736,7 +7736,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
"constraints", "http://www.eclipse.org/gmf/2005/constraints",
"meta", "http://www.eclipse.org/gmf/2005/constraints/meta",
"deprecated", "http://www.eclipse.org/gmf/2006/deprecated"
- });
+ });
}
/**
@@ -7766,7 +7766,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
new String[] {
"ocl", "styles->forAll(style|style.ecoreClass.eAllSuperTypes->including(style.ecoreClass)->one(ePackage.name = \'notation\' and name = \'Style\'))",
"description", "Each style must be a notation::Style or sub-class"
- });
+ });
addAnnotation
(getGenCommonBase_VisualID(),
source,
@@ -7985,7 +7985,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
source,
new String[] {
"documentation", "LinkCreationConstants should be generated if diagram has any links"
- });
+ });
addAnnotation
(genNavigatorEClass.getEOperations().get(9),
source,
@@ -8001,7 +8001,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
* @generated
*/
protected void createMetaAnnotations() {
- String source = "http://www.eclipse.org/gmf/2005/constraints/meta";
+ String source = "http://www.eclipse.org/gmf/2005/constraints/meta";
addAnnotation
(getTypeModelFacet_ModelElementSelector(),
source,
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenResource.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenResource.java
index fc2a58bd9..c3533b7c4 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenResource.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/GMFGenResource.java
@@ -46,6 +46,7 @@ public class GMFGenResource extends MigrationResource {
if (myBackwardSupportedURIs == null) {
myBackwardSupportedURIs = Arrays.asList(new String[] {
"http://www.eclipse.org/gmf/2005/GenModel", //$NON-NLS-1$
+ "http://www.eclipse.org/gmf/2005/GenModel/2.0" //$NON-NLS-1$
});
}
return myBackwardSupportedURIs;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
index f9ac342ab..0c6b492d9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Common.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 1021702cb..254573aea 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/ConstraintProviders.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::GenAuditRoot»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
index 9a387b613..e1f3e2d17 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::ExternalizerUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext
index 00574414d..70bf805ed 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/ExternalizerUtils.ext
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
String getAccessorQualifier(gmfgen::GenEditorGenerator generator) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext
index 460680184..e66e0ee06 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenAuditRoot.ext
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
extension xpt::GenEditorGenerator reexport;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext
index 9cf0db2ad..c93a48e24 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/GenEditorGenerator.ext
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
// FIXME remove java-only GenEditorGenerator#hasAudits or declare it in metamodel
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
index 689d351a9..0893bde96 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 e8dda0b23..1dc2c9ab8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Application.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 f87621c8f..cc432667f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/Perspective.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/WorkbenchAdvisor.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
index 855708180..a7af513d7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 b3f241192..ee75935ab 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 8dedfe33f..63d0586ce 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenApplication-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext
index 7ba7ade97..17807067a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/application/i18n.ext
@@ -10,7 +10,7 @@
* Anna Karjakina (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
String i18nKeyForDefaultFileEditorErrorDialog(gmfgen::GenApplication app) :
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext
index 7f8f00445..054164d9f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/Utils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext
index d97c5672b..0f3b79ac2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
Boolean isFixedFont(gmfgen::Viewmap viewmap) :
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 ac7a9890b..90a1f40ae 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 588f6370e..bb4e0132c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/CreateRefLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
index d21d2c901..1c74f2d7f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/ReorientLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
index 46c45c34c..a1f444c2b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 f73e847f7..44c96b461 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/ReorientRefLinkCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
index 38482fdf9..b7ee97f03 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/editparts/ChildNodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ChildNodeLabelEditPart.xpt
index 1333a0e36..76e12b54a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ChildNodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ChildNodeLabelEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE ChildNodeLabelEditPart FOR gmfgen::GenChildLabelNode-»
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 2336765d5..2ae0f8614 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE visualIDConstant FOR gmfgen::GenCommonBase-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/CompartmentEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/CompartmentEditPart.xpt
index 89294261a..09abdc1a1 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/CompartmentEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/CompartmentEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editparts::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/DiagramEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/DiagramEditPart.xpt
index e0909c725..f5f76f4af 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/DiagramEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/DiagramEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editparts::Utils»
@@ -33,6 +33,27 @@ public class «editPartClassName» extends org.eclipse.gmf.runtime.diagram.ui.edit
«EXPAND xpt::Common::generatedMemberComment»
protected void createDefaultEditPolicies() {
+ «EXPAND editPoliciesMethodBody-»
+ }
+
+«IF shouldGenerateDiagramViewmap()-»
+ «EXPAND xpt::Common::generatedMemberComment»
+ protected org.eclipse.draw2d.IFigure createFigure() {
+ org.eclipse.draw2d.FreeformLayer l = new org.eclipse.draw2d.FreeformLayer();
+ l.setBorder(new org.eclipse.draw2d.MarginBorder(50));
+ «EXPAND initLayout("lm") FOR viewmap.layoutType-»
+ l.setLayoutManager(lm);
+ return l;
+ }
+«ENDIF»
+
+«EXPAND additions-»
+}
+«ENDDEFINE»
+
+«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
+
+«DEFINE editPoliciesMethodBody FOR gmfgen::GenDiagram-»
super.createDefaultEditPolicies();
«EXPAND xpt::diagram::editparts::Common::installSemanticEditPolicy-»
«EXPAND xpt::diagram::editparts::Common::installCanonicalEditPolicy-»
@@ -62,7 +83,34 @@ public class «editPartClassName» extends org.eclipse.gmf.runtime.diagram.ui.edit
}
});
«ENDIF-»
+ «IF shouldGenerateDiagramViewmap()-»
+ // diagram figure does layout; need to install child editpolicy to show selection feedback
+ installEditPolicy(org.eclipse.gef.EditPolicy.LAYOUT_ROLE, new org.eclipse.gef.editpolicies.LayoutEditPolicy() {
+ protected org.eclipse.gef.EditPolicy createChildEditPolicy(org.eclipse.gef.EditPart child) {
+ final org.eclipse.gef.editpolicies.NonResizableEditPolicy p = new org.eclipse.gef.editpolicies.NonResizableEditPolicy();
+ p.setDragAllowed(false);
+ return p;
+ }
+ protected org.eclipse.gef.commands.Command getMoveChildrenCommand(org.eclipse.gef.Request request) {
+ return null;
+ }
+ protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gef.requests.CreateRequest request) {
+ return null;
+ }
+ });
+ «ENDIF-»
«EXPAND xpt::diagram::editparts::Common::behaviour FOR this-»
- }
-}
+«ENDDEFINE»
+
+«DEFINE initLayout(String varName) FOR gmfgen::ViewmapLayoutType-»
+«IF value == gmfgen::ViewmapLayoutType::TOOLBAR_LAYOUT.value-»
+org.eclipse.draw2d.ToolbarLayout «varName» = new org.eclipse.draw2d.ToolbarLayout();
+«varName».setSpacing(10);
+«ELSEIF value == gmfgen::ViewmapLayoutType::FLOW_LAYOUT.value-»
+org.eclipse.draw2d.FlowLayout «varName» = new org.eclipse.draw2d.FlowLayout();
+«varName».setMajorSpacing(10);
+«varName».setMinorSpacing(10);
+«ELSE-»
+org.eclipse.draw2d.LayoutManager «varName» = null; /*FIXME - unknown layout type*/
+«ENDIF-»
«ENDDEFINE» \ No newline at end of file
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 24b74272c..02f5700fe 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/ExternalNodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ExternalNodeLabelEditPart.xpt
index af8c92c66..64d0dcf24 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ExternalNodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/ExternalNodeLabelEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE ExternalNodeLabelEditPart FOR gmfgen::GenExternalNodeLabel-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkEditPart.xpt
index a758a9a8f..2f80dc3ae 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«EXTENSION xpt::diagram::editparts::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkLabelEditPart.xpt
index 5bef030db..aed5624f9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/LinkLabelEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeEditPart.xpt
index 45595c622..59dc0c468 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«EXTENSION xpt::diagram::editparts::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeLabelEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeLabelEditPart.xpt
index c3a093af8..a699508f7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeLabelEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeLabelEditPart.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editparts::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/TextAware.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/TextAware.xpt
index 5e9612513..d80ebcbfb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/TextAware.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/TextAware.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext
index 8515c1cab..6abca092d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/Utils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
Boolean isStoringChildPositions(gmfgen::GenNode node) :
@@ -65,3 +65,8 @@ String getSetterName(gmfgen::ParentAssignedViewmap viewmap) :
String i18nKeyForCompartmentTitle(gmfgen::GenCompartment compartment) :
compartment.editPartClassName+".title"
;
+
+
+boolean shouldGenerateDiagramViewmap(gmfgen::GenDiagram genDiagram) :
+ !{gmfgen::ViewmapLayoutType::UNKNOWN.value, gmfgen::ViewmapLayoutType::XY_LAYOUT.value}.contains(genDiagram.viewmap.layoutType.value)
+; \ No newline at end of file
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 0572ad92f..17f6e38b2 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/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::diagram::editpolicies::Utils»
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 cfdfb58d8..e275a2694 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/DiagramCanonicalEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
index 168bb25b7..a01913588 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/LinkItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
index 913c02d96..484e6b776 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«EXTENSION xpt::GenModelUtils»
«DEFINE LinkItemSemanticEditPolicy FOR gmfgen::GenLink-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext
index 65282914f..34d9a46fc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
index 5530bc4ee..06371ef5a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
@@ -16,7 +16,7 @@
elements and meaningless (should not be generated) for pure design nodes.
«ENDREM»
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 6ded9fd56..8ef54da40 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«EXTENSION xpt::diagram::editpolicies::Utils»
«DEFINE OpenDiagram FOR gmfgen::OpenDiagramBehaviour»
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 7dda65672..3d1d7c846 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE TextSelectionEditPolicy FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext
index 82daeb9e4..2bd7797a9 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
extension xpt::diagram::editpolicies::LinkUtils;
extension xpt::GenModelUtils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
index bbbde60e2..2f16fdb2b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«EXTENSION xpt::GenModelUtils»
«DEFINE childContainerCreateCommand FOR List[gmfgen::GenNode]-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
index c776b34c8..74dd1bab4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - creation logic was moved in commands
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::editpolicies::Utils»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt
index 35012d9ed..13357bdc5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/AppearancePreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramAppearancePreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt
index 75a735e99..cb7714b95 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/ConnectionsPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramConnectionsPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt
index 7971f3eb3..481203503 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/GeneralPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramGeneralPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
index 0b2c874aa..4f969db27 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramPreferenceInitializer«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt
index 9f320be45..dde5a9333 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/PrintingPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramPrintingPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt
index 8c50c1ebc..55e4a6aa2 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/RulersAndGridPreferencePage.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE className FOR gmfgen::GenDiagram»DiagramRulersAndGridPreferencePage«ENDDEFINE»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
index c8ab63f94..bcdec759d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ElementTypes.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ElementTypes.xpt
index bf1464f93..7b60eb687 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ElementTypes.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ElementTypes.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/diagram/providers/MarkerNavigationProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/MarkerNavigationProvider.xpt
index e33eb6602..d80bb1302 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/MarkerNavigationProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/MarkerNavigationProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/providers/ParserProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserProvider.xpt
index 7d7d16c41..93d48efc6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::providers::ParserUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserUtils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserUtils.ext
index 145bea22f..1cc6d727f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserUtils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ParserUtils.ext
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/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/providers/ValidationDecoratorProvider.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ValidationDecoratorProvider.xpt
index 8005b1e56..6a6afab4b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ValidationDecoratorProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ValidationDecoratorProvider.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/providers/extensions.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/extensions.xpt
index 2e5191325..09edb5f98 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/diagram/updater/DiagramUpdater.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
index f8226c6a5..cc990badc 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 1732b0e12..a73895cf5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 d5bd192be..3a9a35fc5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«DEFINE NodeDescriptor FOR gmfgen::GenDiagramUpdater-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext
index d9128805f..f279c8ece 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
extension xpt::diagram::editpolicies::LinkUtils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt
index 77bcb97d4..318b4fe0d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/updater/containerBaseCanonicalMethods.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/views/DiagramViewFactory.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt
index ad3748721..d77eab424 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/DiagramViewFactory.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«DEFINE DiagramViewFactory FOR gmfgen::GenDiagram-»
«EXPAND xpt::Common::copyright FOR editorGen-»
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 2bfabdeb0..4ac762643 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/DiagramContentInitializer.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
index f974cc68d..edb8ab5ba 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«EXTENSION xpt::diagram::updater::Utils»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
index 013f3b756..072714abe 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 bc9126190..909e12087 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«EXTENSION xpt::editor::Utils»
«DEFINE DocumentProvider FOR gmfgen::GenDiagram-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt
index 96d968d8e..9ead3e443 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/DomainModelElementTester.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext
index 667791675..cf98ab8b5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/GenDiagram.ext
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
extension xpt::GenModelUtils;
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
index a1079e1d5..d4947bb97 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - rewritten in xpand
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 13c104ec1..773279d2f 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 4fbeccfa7..ab25d9eef 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::GenDiagram»
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 bbb8fac93..8da63488e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
@@ -11,7 +11,7 @@
* Dmitry Stadnik (Borland) - rewritten in xpand
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 e539c3493..129f4cb21 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 98b5cc461..e17ed6699 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 0cf71336a..8b31ed8b6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::GenDiagram»
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 ab2f04830..7210e6b58 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«DEFINE UriEditorInputTester FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext
index 6af70b4d8..75a2d5af7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
import "http://www.eclipse.org/emf/2002/GenModel";
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
index 78874eb15..04de84b2b 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 2d636e40d..6343400f3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 d913a4799..b13904205 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 e991375f2..223b6eb43 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 09a44315a..71fa49622 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::editor::palette::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext
index 77d81a827..8f161d1a0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/editor/palette/Utils.ext
@@ -10,7 +10,7 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
// TODO instead, use smth like plugin::Utils::activatorFQN(palette.diagram.editorGen.plugin)
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
index 4e242e6df..036143d36 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/getExpression.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/javaExpressionOperation.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/javaExpressionOperation.xpt
index 102302501..47201d72a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/javaExpressionOperation.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/expressions/javaExpressionOperation.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«EXTENSION xpt::GenModelUtils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/manifest.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/manifest.xpt
index ee12be96c..560641973 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/manifest.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/manifest.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::diagram::Utils»
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 d749b17a1..ee1ad443e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 ef7b31fd4..e5c32a4de 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 b78fe573b..5f81963e0 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 cdd6cccd0..de1ab66d6 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«DEFINE DomainNavigatorLabelProvider FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
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 d13b3bf71..10df563a5 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«EXTENSION xpt::navigator::Utils»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
index 8ddf3abc6..84beb82fe 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 6bdab5eec..7eb899c86 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«DEFINE NavigatorItem FOR gmfgen::GenNavigator-»
«EXPAND xpt::Common::copyright FOR editorGen-»
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 9ca6d7a40..638b98fd4 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«EXTENSION xpt::navigator::Utils»
«DEFINE NavigatorLinkHelper FOR gmfgen::GenNavigator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext
index 2d9547ae4..3d22e79f3 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/Utils.ext
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-import "http://www.eclipse.org/gmf/2005/GenModel/2.0";
+import "http://www.eclipse.org/gmf/2006/GenModel";
import "http://www.eclipse.org/emf/2002/Ecore";
List[gmfgen::GenCommonBase] getNavigatorNodes(gmfgen::GenNavigator navigator) :
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 b8c24c8f7..3c3d9ecde 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 c6aae2ed3..c47199aa7 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
@@ -10,7 +10,7 @@
* Alexander Shatalin (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE getEditorInput FOR gmfgen::GenEditorGenerator-»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt
index 09019c764..405c2cffa 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/AbstractParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt
index 3f04f5a4a..ab8b4c510 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/CompositeParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt
index f1e71caa7..497d9847a 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/MessageFormatParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt
index 5f4238b3d..1b9d912ed 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/NativeParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt
index 6a87f6293..f6aa02464 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/PrintfParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
diff --git a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt
index 21a58b5ed..7da28e16e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/parsers/RegexpParser.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/plugin.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin.xpt
index 848a7886d..ec1455dfb 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/plugin.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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/properties.xpt b/plugins/org.eclipse.gmf.codegen/templates/xpt/properties.xpt
index 30b1e9dbc..394b56577 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/properties.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/properties.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 c2786ba2c..647b4d922 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 3a7a57f2c..a047cda6d 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
@@ -9,7 +9,7 @@
* Contributors:
* Artem Tikhomirov (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/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 fc255de59..6d5834e4c 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/xpt/propsheet/extensions.xpt
@@ -10,7 +10,7 @@
* Dmitry Stadnik (Borland) - initial API and implementation
*/
-«IMPORT "http://www.eclipse.org/gmf/2005/GenModel/2.0"»
+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
«DEFINE extensions FOR gmfgen::GenPropertySheet-»

Back to the top