Attachment 99172 Details for Bug 230873 – Modified Generator

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Modified Generator

230873.patch.txt (text/plain), 41.99 KB, created by Tatiana Fesenko

on 2008-05-07 16:22:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tatiana Fesenko

Created: 2008-05-07 16:22:05 EDT

Size: 41.99 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.uml2.diagram.clazz
>Index: src/org/eclipse/uml2/diagram/clazz/part/UMLNewDiagramFileWizard.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.clazz/src/org/eclipse/uml2/diagram/clazz/part/UMLNewDiagramFileWizard.java,v
>retrieving revision 1.6
>diff -u -r1.6 UMLNewDiagramFileWizard.java
>--- src/org/eclipse/uml2/diagram/clazz/part/UMLNewDiagramFileWizard.java	20 May 2007 20:18:13 -0000	1.6
>+++ src/org/eclipse/uml2/diagram/clazz/part/UMLNewDiagramFileWizard.java	7 May 2008 20:19:10 -0000
>@@ -72,8 +72,7 @@
> 			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$
> 		}
> 		myFileCreationPage.setContainerFullPath(filePath);
>-		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "umlclass_diagram")); //$NON-NLS-1$
>-
>+		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "umlclass")); //$NON-NLS-1$
> 		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);
> 		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);
> 		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);
>Index: src/org/eclipse/uml2/diagram/clazz/part/UMLUriEditorInputTester.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.clazz/src/org/eclipse/uml2/diagram/clazz/part/UMLUriEditorInputTester.java,v
>retrieving revision 1.1
>diff -u -r1.1 UMLUriEditorInputTester.java
>--- src/org/eclipse/uml2/diagram/clazz/part/UMLUriEditorInputTester.java	3 Apr 2007 12:09:14 -0000	1.1
>+++ src/org/eclipse/uml2/diagram/clazz/part/UMLUriEditorInputTester.java	7 May 2008 20:19:10 -0000
>@@ -16,7 +16,9 @@
> 			return false;
> 		}
> 		URIEditorInput editorInput = (URIEditorInput) receiver;
>-		return "umlclass_diagram".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$
>+		return "umlclass".equals(editorInput.getURI().fileExtension())//$NON-NLS-1$
>+				|| " umlclass_diagram".equals(editorInput.getURI().fileExtension())//$NON-NLS-1$
>+		;
> 	}
> 
> }
>Index: src/org/eclipse/uml2/diagram/clazz/part/UMLCreationWizard.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.clazz/src/org/eclipse/uml2/diagram/clazz/part/UMLCreationWizard.java,v
>retrieving revision 1.5
>diff -u -r1.5 UMLCreationWizard.java
>--- src/org/eclipse/uml2/diagram/clazz/part/UMLCreationWizard.java	29 Jun 2007 14:28:41 -0000	1.5
>+++ src/org/eclipse/uml2/diagram/clazz/part/UMLCreationWizard.java	7 May 2008 20:19:10 -0000
>@@ -99,7 +99,7 @@
> 	 * @generated
> 	 */
> 	public void addPages() {
>-		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "umlclass_diagram"); //$NON-NLS-1$ //$NON-NLS-2$
>+		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "umlclass"); //$NON-NLS-1$ //$NON-NLS-2$
> 		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);
> 		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);
> 		addPage(diagramModelFilePage);
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.clazz/plugin.xml,v
>retrieving revision 1.43
>diff -u -r1.43 plugin.xml
>--- plugin.xml	7 May 2008 19:34:25 -0000	1.43
>+++ plugin.xml	7 May 2008 20:19:10 -0000
>@@ -257,25 +257,45 @@
>       <?gmfgen generated="true"?>
>       <fileTypes
>          type="text"
>-         extension="umlclass_diagram">
>+         extension="umlclass">
>+      </fileTypes>
>+      <fileTypes
>+         type="text"
>+         extension=" umlclass_diagram">
>       </fileTypes>
>    </extension>
> 
>    <extension point="org.eclipse.emf.ecore.extension_parser">
>       <?gmfgen generated="true"?>
>       <parser
>-         type="umlclass_diagram"
>+         type="umlclass"
>+         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
>+      </parser>
>+      <parser
>+         type=" umlclass_diagram"
>          class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
>       </parser>
>    </extension>
> 
>    <extension point="org.eclipse.ui.editors">
>       <?gmfgen generated="true"?>
>+
>       <editor
>          id="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditorID"
>          name="%editorName"
>          icon="icons/obj16/UMLDiagramFile.gif"
>-         extensions="umlclass_diagram"
>+         extensions="umlclass"
>+         default="true"
>+         class="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditor"
>+         matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
>+         contributorClass="org.eclipse.uml2.diagram.clazz.part.UMLDiagramActionBarContributor">
>+      </editor>
>+
>+      <editor
>+         id="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditorID"
>+         name="%editorName"
>+         icon="icons/obj16/UMLDiagramFile.gif"
>+         extensions=" umlclass_diagram"
>          default="true"
>          class="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditor"
>          matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
>@@ -1482,7 +1502,11 @@
>             <or>
> 	           <and>
>     	          <instanceof value="org.eclipse.core.resources.IFile"/>
>-        	      <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
>+        	      <test property="org.eclipse.core.resources.extension" value="umlclass"/>
>+               </and>
>+	           <and>
>+    	          <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	      <test property="org.eclipse.core.resources.extension" value=" umlclass_diagram"/>
>                </and>
>                <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
>            	   <adapt type="org.eclipse.gmf.runtime.notation.View">
>@@ -1505,7 +1529,11 @@
>                <or>
> 	              <and>
>     	             <instanceof value="org.eclipse.core.resources.IFile"/>
>-        	         <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
>+        	         <test property="org.eclipse.core.resources.extension" value="umlclass"/>
>+                  </and>
>+	              <and>
>+    	             <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	         <test property="org.eclipse.core.resources.extension" value=" umlclass_diagram"/>
>                   </and>
>                   <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
>                </or>
>#P org.eclipse.uml2.diagram.def
>Index: structures/classDiagram.gmfgen
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.def/structures/classDiagram.gmfgen,v
>retrieving revision 1.50
>diff -u -r1.50 classDiagram.gmfgen
>--- structures/classDiagram.gmfgen	7 May 2008 19:34:23 -0000	1.50
>+++ structures/classDiagram.gmfgen	7 May 2008 20:19:14 -0000
>@@ -5,7 +5,7 @@
>     xmlns:gmfgen="http://www.eclipse.org/gmf/2006/GenModel"
>     xmlns:uml2.gmfgenext="http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0" packageNamePrefix="org.eclipse.uml2.diagram.clazz"
>     modelID="UMLClass"
>-    diagramFileExtension="umlclass_diagram"
>+    diagramFileExtension="umlclass, umlclass_diagram"
>     dynamicTemplates="true"
>     templateDirectory="/org.eclipse.uml2.diagram.def/dynamic-templates/codegen">
>   <diagram
>Index: dynamic-templates/codegen/aspects/xpt/plugin/plugin.xpt
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/plugin/plugin.xpt,v
>retrieving revision 1.3
>diff -u -r1.3 plugin.xpt
>--- dynamic-templates/codegen/aspects/xpt/plugin/plugin.xpt	26 Feb 2008 02:09:15 -0000	1.3
>+++ dynamic-templates/codegen/aspects/xpt/plugin/plugin.xpt	7 May 2008 20:19:11 -0000
>@@ -19,6 +19,53 @@
> 
> «EXTENSION xpt::actions::Utils»  
> «EXTENSION aspects::xpt::plugin::Utils»
>+«EXTENSION aspects::xpt::FileExtensionUtils»
>+
>+«AROUND plugin FOR gmfgen::GenPlugin-»
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?eclipse version="3.0"?>
>+«EXPAND xpt::Common::xcopyright FOR editorGen-»
>+<plugin>
>+
>+   <extension point="org.eclipse.team.core.fileTypes">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
>+«FOREACH editorGen.collectAllExtensions() AS dfe-»
>+      <fileTypes
>+         type="text"
>+         extension="«dfe»">
>+      </fileTypes>
>+«ENDFOREACH-»
>+«REM» End of #230873«ENDREM-»
>+   </extension>
>+
>+   <extension point="org.eclipse.emf.ecore.extension_parser">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
>+«FOREACH editorGen.collectAllExtensions() AS dfe-»
>+      <parser
>+         type="«dfe»"
>+         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
>+      </parser>
>+«ENDFOREACH-»
>+«REM» End of #230873«ENDREM-»
>+   </extension>
>+
>+«EXPAND xpt::editor::extensions::extensions FOR editorGen-»
>+«EXPAND xpt::plugin::plugin::menu-»
>+«EXPAND xpt::plugin::plugin::validation FOR editorGen.diagram-»
>+«EXPAND xpt::plugin::plugin::metrics FOR editorGen.metrics-»
>+«EXPAND xpt::diagram::preferences::extensions::extensions FOR editorGen.diagram-»
>+«EXPAND xpt::propsheet::extensions::extensions FOR editorGen.propertySheet-»
>+«EXPAND xpt::providers::extensions::extensions FOR editorGen.diagram-»
>+«EXPAND xpt::navigator::extensions::extensions FOR editorGen.navigator-»
>+«EXPAND xpt::application::extensions::extensions FOR editorGen.application-»
>+«EXPAND xpt::ConstraintProviders::extensions FOR editorGen-»
>+«EXPAND xpt::diagram::updater::extensions::extensions FOR editorGen.diagramUpdater-»
>+«EXPAND xpt::plugin::plugin::additions-»
>+</plugin>
>+«ENDAROUND»
>+
> 
> «AROUND additions FOR gmfgen::GenPlugin»
> «EXPAND contributionItemProviders FOREACH editorGen.diagram.topLevelNodes»
>Index: dynamic-templates/codegen/aspects/xpt/editor/NewDiagramFileWizard.xpt
>===================================================================
>RCS file: dynamic-templates/codegen/aspects/xpt/editor/NewDiagramFileWizard.xpt
>diff -N dynamic-templates/codegen/aspects/xpt/editor/NewDiagramFileWizard.xpt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dynamic-templates/codegen/aspects/xpt/editor/NewDiagramFileWizard.xpt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,167 @@
>+/*
>+ * Copyright (c) 2007 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    Alexander Shatalin (Borland) - initial API and implementation
>+ *    Dmitry Stadnik (Borland) - rewritten in xpand
>+ *    Tatiana Fesenko (Borland) - fix for bugzilla #230873 'Make diagram file extension shorter' 
>+ */
>+
>+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
>+«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
>+
>+«EXTENSION xpt::editor::Utils»
>+«EXTENSION aspects::xpt::FileExtensionUtils»
>+
>+«AROUND NewDiagramFileWizard FOR gmfgen::GenDiagram-»
>+«EXPAND xpt::Common::copyright FOR editorGen-»
>+package «editorGen.editor.packageName»;
>+
>+«EXPAND xpt::Common::generatedClassComment»
>+public class «EXPAND xpt::editor::NewDiagramFileWizard::className» extends org.eclipse.jface.wizard.Wizard {
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	private «EXPAND xpt::editor::NewDiagramFileWizard::creationPage» myFileCreationPage;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	private «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» diagramRootElementSelectionPage;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	private org.eclipse.emf.transaction.TransactionalEditingDomain myEditingDomain;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public «EXPAND xpt::editor::NewDiagramFileWizard::className»(org.eclipse.emf.common.util.URI domainModelURI,
>+			org.eclipse.emf.ecore.EObject diagramRoot,
>+			org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain) {
>+		assert domainModelURI != null : "Domain model uri must be specified"; «EXPAND xpt::Common::nonNLS»
>+	    assert diagramRoot != null : "Doagram root element must be specified"; «EXPAND xpt::Common::nonNLS»
>+	    assert editingDomain != null : "Editing domain must be specified"; «EXPAND xpt::Common::nonNLS»
>+
>+		myFileCreationPage = new «EXPAND xpt::editor::NewDiagramFileWizard::creationPage»(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardCreationPage().nameKey()) FOR editorGen», org.eclipse.jface.viewers.StructuredSelection.EMPTY);
>+		myFileCreationPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardCreationPage().titleKey()) FOR editorGen»);
>+		myFileCreationPage.setDescription(org.eclipse.osgi.util.NLS.bind(
>+				«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardCreationPage().descriptionKey()) FOR editorGen», 
>+				«EXPAND xpt::editor::VisualIDRegistry::modelID»));
>+		org.eclipse.core.runtime.IPath filePath;
>+		String fileName = domainModelURI.trimFileExtension().lastSegment();
>+		if (domainModelURI.isPlatformResource()) {
>+			filePath = new org.eclipse.core.runtime.Path(domainModelURI.trimSegments(1).toPlatformString(true));
>+		} else if (domainModelURI.isFile()) {
>+			filePath = new org.eclipse.core.runtime.Path(domainModelURI.trimSegments(1).toFileString());
>+		} else {
>+			// TODO : use some default path
>+			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); «EXPAND xpt::Common::nonNLS»
>+		}
>+		myFileCreationPage.setContainerFullPath(filePath);
>+		«REM» #230873 'Make diagram file extension shorter'
>+		The only change is here. We take the first extension from the comma-separated list«ENDREM-»
>+		myFileCreationPage.setFileName(«getDiagramEditorUtilQualifiedClassName()».getUniqueFileName(
>+				filePath, fileName, "«editorGen.getDefaultDiagramExtension()»")); «EXPAND xpt::Common::nonNLS»
>+		«REM»End of the only change«ENDREM-»
>+		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPage().nameKey()) FOR editorGen»);
>+		diagramRootElementSelectionPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPage().titleKey()) FOR editorGen»);
>+		diagramRootElementSelectionPage.setDescription(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPage().descriptionKey()) FOR editorGen»);
>+		diagramRootElementSelectionPage.setModelElement(diagramRoot);
>+
>+	   	myEditingDomain = editingDomain;
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public void addPages() {
>+		addPage(myFileCreationPage);
>+		addPage(diagramRootElementSelectionPage);
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public boolean performFinish() {
>+		java.util.List affectedFiles = new java.util.LinkedList();
>+		«IF null == editorGen.application-»
>+		org.eclipse.core.resources.IFile diagramFile = myFileCreationPage.createNewFile();
>+		«EXPAND xpt::Common::setCharset("diagramFile")-»
>+		affectedFiles.add(diagramFile);
>+		org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);
>+		«ELSE-»
>+		org.eclipse.core.runtime.IPath diagramModelPath = myFileCreationPage.getContainerFullPath().append(myFileCreationPage.getFileName());
>+		org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createFileURI(diagramModelPath.toString());
>+		«ENDIF-»
>+		org.eclipse.emf.ecore.resource.ResourceSet resourceSet = myEditingDomain.getResourceSet();
>+		final org.eclipse.emf.ecore.resource.Resource diagramResource = resourceSet.createResource(diagramModelURI);
>+		org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand command =
>+			new org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand(
>+				myEditingDomain, «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardInitDiagramCommand()) FOR editorGen», affectedFiles) {
>+
>+			protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(
>+					org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info)
>+						throws org.eclipse.core.commands.ExecutionException {
>+				int diagramVID = «EXPAND xpt::editor::VisualIDRegistry::getDiagramVisualIDMethodCall»(diagramRootElementSelectionPage.getModelElement());
>+				if (diagramVID != «EXPAND xpt::editor::VisualIDRegistry::visualID») {
>+					return org.eclipse.gmf.runtime.common.core.command.CommandResult.newErrorCommandResult(
>+						«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardIncorrectRootError()) FOR editorGen»);
>+				}
>+				org.eclipse.gmf.runtime.notation.Diagram diagram =
>+					org.eclipse.gmf.runtime.diagram.core.services.ViewService.createDiagram(
>+						diagramRootElementSelectionPage.getModelElement(), «EXPAND xpt::editor::VisualIDRegistry::modelID»,
>+						«editorGen.plugin.getActivatorQualifiedClassName()».DIAGRAM_PREFERENCES_HINT);
>+				diagramResource.getContents().add(diagram);
>+				«IF editorGen.sameFileForDiagramAndModel-»
>+				diagramResource.getContents().add(diagram.getElement());
>+				«ENDIF-»
>+				«IF !synchronized-»
>+				new «getDiagramContentInitializerQualifiedClassName()»().initDiagramContent(diagram);			
>+				«ENDIF-»
>+				return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
>+			}
>+		};
>+		try {
>+			org.eclipse.core.commands.operations.OperationHistoryFactory.getOperationHistory().execute(
>+				command, new org.eclipse.core.runtime.NullProgressMonitor(), null);
>+			diagramResource.save(«EXPAND xpt::Common::getSaveOptions»);
>+			«getDiagramEditorUtilQualifiedClassName()».openDiagram(diagramResource);
>+		} catch (org.eclipse.core.commands.ExecutionException e) {
>+			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
>+				"Unable to create model and diagram", e); «EXPAND xpt::Common::nonNLS»
>+		} catch (java.io.IOException ex) {
>+			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
>+				"Save operation failed for: " + diagramModelURI, ex); «EXPAND xpt::Common::nonNLS»
>+		} catch (org.eclipse.ui.PartInitException ex) {
>+			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
>+				"Unable to open editor", ex); «EXPAND xpt::Common::nonNLS»
>+		}			
>+		return true;
>+	}
>+
>+	«EXPAND xpt::Common::generatedClassComment»
>+	private static class DiagramRootElementSelectionPage extends «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» {
>+
>+		«EXPAND xpt::Common::generatedMemberComment»
>+		protected DiagramRootElementSelectionPage(String pageName) {
>+			super(pageName);
>+		}
>+
>+		«EXPAND xpt::Common::generatedMemberComment»
>+		protected String getSelectionTitle() {
>+			return «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle()) FOR editorGen»;
>+		}
>+
>+		«EXPAND xpt::Common::generatedMemberComment»
>+		protected boolean validatePage() {
>+			if (selectedModelElement == null) {
>+				setErrorMessage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage()) FOR editorGen»);
>+				return false;
>+			}
>+			boolean result = org.eclipse.gmf.runtime.diagram.core.services.ViewService.getInstance().provides(
>+				new org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation(
>+					new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(selectedModelElement),
>+					«EXPAND xpt::editor::VisualIDRegistry::modelID»,
>+					«editorGen.plugin.getActivatorQualifiedClassName()».DIAGRAM_PREFERENCES_HINT));
>+			setErrorMessage(result ? null : «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage()) FOR editorGen»);
>+			return result;
>+		}
>+	}
>+}
>+«ENDAROUND»
>Index: dynamic-templates/codegen/aspects/xpt/editor/UriEditorInputTester.xpt
>===================================================================
>RCS file: dynamic-templates/codegen/aspects/xpt/editor/UriEditorInputTester.xpt
>diff -N dynamic-templates/codegen/aspects/xpt/editor/UriEditorInputTester.xpt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dynamic-templates/codegen/aspects/xpt/editor/UriEditorInputTester.xpt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,31 @@
>+/*
>+ * Copyright (c) 2007 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    Alexander Shatalin (Borland) - initial API and implementation
>+ *    Tatiana Fesenko (Borland) - fix for bugzilla #230873 'Make diagram file extension shorter' 
>+ */
>+
>+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
>+
>+«EXTENSION aspects::xpt::FileExtensionUtils»
>+
>+«AROUND test FOR gmfgen::GenEditorGenerator-»
>+	«EXPAND xpt::Common::generatedMemberComment»
>+public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
>+	if (false == receiver instanceof org.eclipse.emf.common.ui.URIEditorInput) {
>+		return false;
>+	}
>+	org.eclipse.emf.common.ui.URIEditorInput editorInput = (org.eclipse.emf.common.ui.URIEditorInput) receiver;
>+«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
>+«FOREACH collectAllExtensions() AS dfe ITERATOR iter-»
>+	«IF iter.isFirstIteration()»return «ELSE» || «ENDIF»"«dfe»".equals(editorInput.getURI().fileExtension())«EXPAND xpt::Common::nonNLS»
>+«ENDFOREACH»;
>+«REM» End of #230873«ENDREM-»
>+	}
>+«ENDAROUND»
>Index: dynamic-templates/codegen/aspects/xpt/navigator/extensions.xpt
>===================================================================
>RCS file: dynamic-templates/codegen/aspects/xpt/navigator/extensions.xpt
>diff -N dynamic-templates/codegen/aspects/xpt/navigator/extensions.xpt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dynamic-templates/codegen/aspects/xpt/navigator/extensions.xpt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,135 @@
>+/*
>+ * Copyright (c) 2007 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    Dmitry Stadnik (Borland) - initial API and implementation
>+ *    Tatiana Fesenko (Borland) - fix for bugzilla #230873 'Make diagram file extension shorter' 
>+ */
>+
>+«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 aspects::xpt::FileExtensionUtils»
>+
>+«AROUND extensions FOR gmfgen::GenNavigator-»
>+	«EXPAND xpt::navigator::extensions::editorInputPropertyTester("URIEditorInput", "org.eclipse.emf.common.ui.URIEditorInput", getUriInputTesterQualifiedClassName())-»
>+«IF editorGen.diagram.generateShortcutIcon()-»
>+
>+	«EXPAND xpt::navigator::extensions::editorInputPropertyTester("Shortcut", "org.eclipse.gmf.runtime.notation.View", editorGen.diagram.getShortcutPropertyTesterQualifiedClassName())-»
>+«ENDIF-»
>+«IF generateDomainModelNavigator && null != editorGen.domainGenModel-»
>+
>+	«EXPAND xpt::navigator::extensions::editorInputPropertyTester("DomainModelElement", "org.eclipse.emf.ecore.EObject", getDomainModelElementTesterQualifiedClassName())-»
>+«ENDIF-»
>+
>+	«EXPAND xpt::navigator::extensions::registerBindings-»
>+
>+   <extension point="org.eclipse.ui.navigator.navigatorContent">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+      <navigatorContent
>+            id="«contentExtensionID»" 
>+            name="«contentExtensionName»" 
>+            priority="«contentExtensionPriority»" 
>+            contentProvider="«getContentProviderQualifiedClassName()»" 
>+            labelProvider="«getLabelProviderQualifiedClassName()»"
>+            icon="«editorGen.editor.iconPathX»"
>+            activeByDefault="true">
>+         <triggerPoints>
>+            <or>
>+«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
>+«FOREACH editorGen.collectAllExtensions() AS dfe-»
>+	           <and>
>+    	          <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	      <test property="org.eclipse.core.resources.extension" value="«dfe»"/>
>+               </and>
>+«ENDFOREACH-»
>+«REM» End of #230873«ENDREM-»
>+               <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
>+«IF editorGen.diagram.generateShortcutIcon()-»
>+           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
>+           	      <test property="«editorGen.plugin.iD».isShortcut"/>
>+           	   </adapt>
>+«ENDIF-»
>+            </or>
>+         </triggerPoints>
>+         <possibleChildren>
>+            <or>
>+         	   <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
>+«IF editorGen.diagram.generateShortcutIcon()-»
>+           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
>+           	      <test property="«editorGen.plugin.iD».isShortcut"/>
>+           	   </adapt>
>+«ENDIF-»
>+            </or>
>+         </possibleChildren>
>+         <commonSorter 
>+               id="«sorterExtensionID»" 
>+               class="«getSorterQualifiedClassName()»">
>+            <parentExpression>
>+               <or>
>+«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
>+«FOREACH editorGen.collectAllExtensions() AS dfe-»
>+	              <and>
>+    	             <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	         <test property="org.eclipse.core.resources.extension" value="«dfe»"/>
>+                  </and>
>+«ENDFOREACH-»
>+«REM» End of #230873«ENDREM-»
>+                  <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
>+               </or>
>+            </parentExpression>
>+         </commonSorter>
>+      </navigatorContent>
>+«IF generateDomainModelNavigator && null != editorGen.domainGenModel-»
>+      <navigatorContent
>+            id="«domainContentExtensionID»" 
>+            name="«domainContentExtensionName»" 
>+            priority="«domainContentExtensionPriority»" 
>+            contentProvider="«getDomainContentProviderQualifiedClassName()»" 
>+            labelProvider="«getDomainLabelProviderQualifiedClassName()»"
>+            icon="«editorGen.editor.iconPathX»"
>+            activeByDefault="true">
>+         <triggerPoints>
>+            <or>
>+	           <and>
>+    	          <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	      <test property="org.eclipse.core.resources.extension" value="«editorGen.domainFileExtension»"/>
>+               </and>
>+               <and>
>+                  <instanceof value="org.eclipse.emf.ecore.EObject"/>
>+                  <test property="«editorGen.plugin.iD».isDomainModelElement"/>
>+               </and>
>+            </or>
>+         </triggerPoints>
>+         <possibleChildren>
>+            <and>
>+       	       <instanceof value="org.eclipse.emf.ecore.EObject"/>
>+       	       <test property="«editorGen.plugin.iD».isDomainModelElement"/>
>+       	    </and>
>+         </possibleChildren>
>+      </navigatorContent>
>+«ENDIF-»
>+      <actionProvider
>+            id="«actionProviderID»"
>+            class="«getActionProviderQualifiedClassName()»">
>+         <enablement>
>+            <or>
>+               <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
>+«IF editorGen.diagram.generateShortcutIcon()-»
>+           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
>+           	      <test property="«editorGen.plugin.iD».isShortcut"/>
>+           	   </adapt>
>+«ENDIF-»
>+            </or>
>+         </enablement>
>+      </actionProvider>
>+   </extension>
>+   
>+	«EXPAND xpt::navigator::extensions::registerLinkHelper-»
>+«ENDAROUND»
>Index: dynamic-templates/codegen/aspects/xpt/editor/CreationWizard.xpt
>===================================================================
>RCS file: dynamic-templates/codegen/aspects/xpt/editor/CreationWizard.xpt
>diff -N dynamic-templates/codegen/aspects/xpt/editor/CreationWizard.xpt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dynamic-templates/codegen/aspects/xpt/editor/CreationWizard.xpt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,150 @@
>+/*
>+ * Copyright (c) 2007 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    Dmitry Stadnik (Borland) - initial API and implementation
>+ *    Tatiana Fesenko (Borland) - fix for bugzilla #230873 'Make diagram file extension shorter' 
>+ */
>+ 
>+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
>+
>+«EXTENSION xpt::editor::Utils»
>+«EXTENSION aspects::xpt::FileExtensionUtils»
>+
>+«AROUND xpt::editor::CreationWizard::CreationWizard FOR gmfgen::GenDiagram-»
>+«EXPAND xpt::Common::copyright FOR editorGen-»
>+package «editorGen.editor.packageName»;
>+
>+«EXPAND xpt::Common::generatedClassComment»
>+public class «creationWizardClassName»
>+		extends org.eclipse.jface.wizard.Wizard implements org.eclipse.ui.INewWizard {
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	private org.eclipse.ui.IWorkbench workbench;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+    protected org.eclipse.jface.viewers.IStructuredSelection selection;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	protected «getCreationWizardPageQualifiedClassName()» diagramModelFilePage;
>+	«IF isStandaloneDomainModel()-»
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	protected «getCreationWizardPageQualifiedClassName()» domainModelFilePage;
>+	«ENDIF-»
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	protected org.eclipse.emf.ecore.resource.Resource diagram;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	private boolean openNewlyCreatedDiagramEditor = true;
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+    public org.eclipse.ui.IWorkbench getWorkbench() {
>+        return workbench;
>+    }
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public org.eclipse.jface.viewers.IStructuredSelection getSelection() {
>+        return selection;
>+    }
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public final org.eclipse.emf.ecore.resource.Resource getDiagram() {
>+		return diagram;
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public final boolean isOpenNewlyCreatedDiagramEditor() {
>+		return openNewlyCreatedDiagramEditor;
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {
>+		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public void init(org.eclipse.ui.IWorkbench workbench, org.eclipse.jface.viewers.IStructuredSelection selection) {
>+        this.workbench = workbench;
>+        this.selection = selection;
>+		setWindowTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizard().titleKey()) FOR editorGen»);
>+		setDefaultPageImageDescriptor(«editorGen.plugin.getActivatorQualifiedClassName()».getBundledImageDescriptor(
>+				"icons/wizban/New«IF domainDiagramElement != null»«domainDiagramElement.genPackage.prefix»«ENDIF»Wizard.gif")); //$NON-NLS-1$
>+		setNeedsProgressMonitor(true);
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public void addPages() {
>+		«REM» #230873 'Make diagram file extension shorter'
>+		The only change is here. We take the first extension from the comma-separated list«ENDREM-»
>+		diagramModelFilePage = new «getCreationWizardPageQualifiedClassName()»(
>+				"DiagramModelFile", getSelection(), "«editorGen.getDefaultDiagramExtension()»"); //$NON-NLS-1$ //$NON-NLS-2$
>+		«REM»End of the only change«ENDREM-»
>+		diagramModelFilePage.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardDiagramPage().titleKey()) FOR editorGen»);
>+		diagramModelFilePage.setDescription(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardDiagramPage().descriptionKey()) FOR editorGen»);
>+		addPage(diagramModelFilePage);
>+	«IF isStandaloneDomainModel()-»
>+
>+		domainModelFilePage = new «getCreationWizardPageQualifiedClassName()»(
>+				"DomainModelFile", getSelection(), "«editorGen.domainFileExtension»"); //$NON-NLS-1$ //$NON-NLS-2$
>+		domainModelFilePage.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardDomainPage().titleKey()) FOR editorGen»);
>+		domainModelFilePage.setDescription(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardDomainPage().descriptionKey()) FOR editorGen»);
>+		addPage(domainModelFilePage);
>+	«ENDIF-»
>+	}
>+
>+	«EXPAND xpt::Common::generatedMemberComment»
>+	public boolean performFinish() {
>+		org.eclipse.jface.operation.IRunnableWithProgress op =
>+	«IF editorGen.application == null-»
>+				new org.eclipse.ui.actions.WorkspaceModifyOperation(null) {
>+
>+			protected void execute(org.eclipse.core.runtime.IProgressMonitor monitor)
>+					throws org.eclipse.core.runtime.CoreException, InterruptedException {
>+	«ELSE-»
>+				new org.eclipse.jface.operation.IRunnableWithProgress() {
>+
>+			public void run(org.eclipse.core.runtime.IProgressMonitor monitor)
>+					throws InvocationTargetException, InterruptedException {
>+	«ENDIF-»
>+				diagram = «getDiagramEditorUtilQualifiedClassName()».createDiagram(diagramModelFilePage.getURI(),
>+	«IF isStandaloneDomainModel()-»
>+						domainModelFilePage.getURI(),
>+	«ENDIF-»
>+						monitor);
>+				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {
>+					try {
>+						«getDiagramEditorUtilQualifiedClassName()».openDiagram(diagram);
>+					} catch (org.eclipse.ui.PartInitException e) {
>+						org.eclipse.jface.dialogs.ErrorDialog.openError(getContainer().getShell(),
>+								«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardOpenEditorError()) FOR editorGen», null, e.getStatus());
>+					}
>+				}
>+			}
>+		};
>+		try {
>+			getContainer().run(false, true, op);
>+		} catch (InterruptedException e) {
>+			return false;
>+		} catch (java.lang.reflect.InvocationTargetException e) {
>+			if (e.getTargetException() instanceof org.eclipse.core.runtime.CoreException) {
>+				org.eclipse.jface.dialogs.ErrorDialog.openError(getContainer().getShell(),
>+						«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardCreationError()) FOR editorGen», null,
>+						((org.eclipse.core.runtime.CoreException) e.getTargetException()).getStatus());
>+			} else {
>+				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
>+						"Error creating diagram", e.getTargetException()); //$NON-NLS-1$
>+			}
>+			return false;
>+		}
>+		return diagram != null;
>+	}
>+	«EXPAND xpt::editor::CreationWizard::additions-»
>+}
>+«ENDAROUND»
>Index: dynamic-templates/codegen/aspects/xpt/editor/extensions.xpt
>===================================================================
>RCS file: dynamic-templates/codegen/aspects/xpt/editor/extensions.xpt
>diff -N dynamic-templates/codegen/aspects/xpt/editor/extensions.xpt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dynamic-templates/codegen/aspects/xpt/editor/extensions.xpt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,126 @@
>+/*
>+ * Copyright (c) 2007 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    Dmitry Stadnik (Borland) - initial API and implementation
>+ *    Tatiana Fesenko (Borland) - fix for bugzilla #230873 'Make diagram file extension shorter' 
>+ */
>+
>+«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
>+«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
>+
>+«EXTENSION aspects::xpt::FileExtensionUtils»
>+
>+«AROUND extensions FOR gmfgen::GenEditorGenerator-»
>+   <extension point="org.eclipse.ui.editors">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+«REM» #230873 'Make diagram file extension shorter'
>+Change: We iterate over diagramFileExtension _list_ here«ENDREM-»
>+«FOREACH collectAllExtensions() AS dfe-»
>+«REM» End of #230873«ENDREM»
>+      <editor
>+         id="«editor.iD»"
>+         name="%editorName"
>+         icon="«editor.iconPathX»"
>+«REM» #230873: list item is taken here«ENDREM-»
>+         extensions="«dfe»"
>+«REM» End of #230873«ENDREM-»
>+         default="true"
>+         class="«editor.getQualifiedClassName()»"
>+         matchingStrategy="«diagram.getMatchingStrategyQualifiedClassName()»"
>+         contributorClass="«editor.getActionBarContributorQualifiedClassName()»">
>+      </editor>
>+«ENDFOREACH»
>+   </extension>
>+   
>+   <extension point="org.eclipse.ui.contexts">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+      <context
>+         description="%context.description"
>+         id="«editor.contextID»"
>+         name="%context.name"
>+         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
>+      </context>
>+   </extension>
>+
>+   <extension point="org.eclipse.ui.newWizards">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+  	  <wizard
>+  	     name="%newWizardName"
>+  	     icon="«diagram.creationWizardIconPathX»"
>+  	     category="«diagram.creationWizardCategoryID»"
>+  	     class="«diagram.getCreationWizardQualifiedClassName()»"
>+  	     id="«diagram.getCreationWizardQualifiedClassName()»ID">
>+  	  	 <description>%newWizardDesc</description>  
>+      </wizard>
>+   </extension>
>+
>+   <extension point="org.eclipse.ui.popupMenus">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+«IF diagram.generateCreateShortcutAction()-»
>+      <objectContribution
>+            adaptable="false"
>+            id="«plugin.iD».CreateShortcut"
>+            objectClass="«diagram.getEditPartQualifiedClassName()»">
>+         <action
>+               class="«diagram.getCreateShortcutActionQualifiedClassName()»"
>+               enablesFor="1"
>+               id="«plugin.iD».CreateShortcutAction"
>+               label="%createShortcutActionLabel"
>+               menubarPath="additions">
>+         </action>
>+      </objectContribution>                      
>+«ENDIF-»
>+      <objectContribution
>+            adaptable="false"
>+            id="«plugin.iD».LoadResource"
>+            objectClass="«diagram.getEditPartQualifiedClassName()»">
>+         <action
>+               class="«diagram.getLoadResourceActionQualifiedClassName()»"
>+               enablesFor="1"
>+               id="«plugin.iD».LoadResourceAction"
>+               label="%loadResourceActionLabel"
>+               menubarPath="additions">
>+         </action>
>+      </objectContribution>           
>+   </extension>
>+«IF diagram.generateInitDiagramAction()-»
>+
>+   «IF null == application»<extension point="org.eclipse.ui.popupMenus">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+      <objectContribution
>+            id="«plugin.iD».InitDiagram"
>+            nameFilter="*.«domainFileExtension»"
>+            objectClass="org.eclipse.core.resources.IFile">
>+         <action
>+               label="%initDiagramActionLabel"
>+               class="«diagram.getInitDiagramFileActionQualifiedClassName()»"
>+               menubarPath="additions"
>+               enablesFor="1"
>+               id="«plugin.iD».InitDiagramAction">
>+         </action>
>+      </objectContribution>
>+   </extension>
>+	«ELSE-»
>+   <extension point="org.eclipse.ui.actionSets">
>+      «EXPAND xpt::Common::xmlGeneratedTag»
>+      <actionSet
>+            label="%initDiagramActionLabel"
>+            visible="true"
>+            id="«plugin.iD».InitDiagram">
>+         <action
>+               label="%initDiagramActionLabel"
>+               class="«diagram.getInitDiagramFileActionQualifiedClassName()»"
>+               menubarPath="file/additions"
>+               id="«plugin.iD».InitDiagramAction">
>+         </action>
>+      </actionSet>
>+   </extension>
>+	«ENDIF-»
>+«ENDIF-»
>+«ENDAROUND»
>Index: dynamic-templates/codegen/aspects/xpt/FileExtensionUtils.ext
>===================================================================
>RCS file: dynamic-templates/codegen/aspects/xpt/FileExtensionUtils.ext
>diff -N dynamic-templates/codegen/aspects/xpt/FileExtensionUtils.ext
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ dynamic-templates/codegen/aspects/xpt/FileExtensionUtils.ext	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+/*
>+ * Copyright (c) 2008 Borland Software Corporation
>+ * 
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ */
>+
>+import "http://www.eclipse.org/emf/2002/Ecore";
>+import "http://www.eclipse.org/gmf/2006/GenModel";
>+
>+String getDefaultDiagramExtension(GenEditorGenerator generator) :
>+	let extensions = collectAllExtensions(generator):
>+	extensions.isEmpty() ? null : extensions.get(0) 
>+;
>+
>+List[String] collectAllExtensions(GenEditorGenerator generator) :
>+	collectAllExtensions(generator.diagramFileExtension)
>+;
>+
>+private List[String] collectAllExtensions(String extensionList) :
>+	extensionList.split(",")
>+;

Actions: View | Diff

Attachments on bug 230873: 99058 | 99172