Attachment #99172 for bug #230873

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

Lines 72-79 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/part/UMLNewDiagramFileWizard.java (-2 / +1 lines)
72	throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$	72	throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$
73	}	73	}
74	myFileCreationPage.setContainerFullPath(filePath);	74	myFileCreationPage.setContainerFullPath(filePath);
75	myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "umlclass_diagram")); //$NON-NLS-1$	75	myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "umlclass")); //$NON-NLS-1$
76
77	diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);	76	diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);
78	diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);	77	diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);
79	diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);	78	diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

Lines 16-22 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/part/UMLUriEditorInputTester.java (-1 / +3 lines)
16	return false;	16	return false;
17	}	17	}
18	URIEditorInput editorInput = (URIEditorInput) receiver;	18	URIEditorInput editorInput = (URIEditorInput) receiver;
19	return "umlclass_diagram".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$	19	return "umlclass".equals(editorInput.getURI().fileExtension())//$NON-NLS-1$
		20	\|\| " umlclass_diagram".equals(editorInput.getURI().fileExtension())//$NON-NLS-1$
		21	;
20	}	22	}
21		23
22	}	24	}

Lines 99-105 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/part/UMLCreationWizard.java (-1 / +1 lines)
99	* @generated	99	* @generated
100	*/	100	*/
101	public void addPages() {	101	public void addPages() {
102	diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "umlclass_diagram"); //$NON-NLS-1$ //$NON-NLS-2$	102	diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "umlclass"); //$NON-NLS-1$ //$NON-NLS-2$
103	diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);	103	diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);
104	diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);	104	diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);
105	addPage(diagramModelFilePage);	105	addPage(diagramModelFilePage);

Lines 257-281 Link Here

(-)plugin.xml (-5 / +33 lines)
257	<?gmfgen generated="true"?>	257	<?gmfgen generated="true"?>
258	<fileTypes	258	<fileTypes
259	type="text"	259	type="text"
260	extension="umlclass_diagram">	260	extension="umlclass">
		261	</fileTypes>
		262	<fileTypes
		263	type="text"
		264	extension=" umlclass_diagram">
261	</fileTypes>	265	</fileTypes>
262	</extension>	266	</extension>
263		267
264	<extension point="org.eclipse.emf.ecore.extension_parser">	268	<extension point="org.eclipse.emf.ecore.extension_parser">
265	<?gmfgen generated="true"?>	269	<?gmfgen generated="true"?>
266	<parser	270	<parser
267	type="umlclass_diagram"	271	type="umlclass"
		272	class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
		273	</parser>
		274	<parser
		275	type=" umlclass_diagram"
268	class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">	276	class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
269	</parser>	277	</parser>
270	</extension>	278	</extension>
271		279
272	<extension point="org.eclipse.ui.editors">	280	<extension point="org.eclipse.ui.editors">
273	<?gmfgen generated="true"?>	281	<?gmfgen generated="true"?>
		282
274	<editor	283	<editor
275	id="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditorID"	284	id="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditorID"
276	name="%editorName"	285	name="%editorName"
277	icon="icons/obj16/UMLDiagramFile.gif"	286	icon="icons/obj16/UMLDiagramFile.gif"
278	extensions="umlclass_diagram"	287	extensions="umlclass"
		288	default="true"
		289	class="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditor"
		290	matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
		291	contributorClass="org.eclipse.uml2.diagram.clazz.part.UMLDiagramActionBarContributor">
		292	</editor>
		293
		294	<editor
		295	id="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditorID"
		296	name="%editorName"
		297	icon="icons/obj16/UMLDiagramFile.gif"
		298	extensions=" umlclass_diagram"
279	default="true"	299	default="true"
280	class="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditor"	300	class="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditor"
281	matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"	301	matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
Lines 1482-1488 Link Here
1482	<or>	1502	<or>
1483	<and>	1503	<and>
1484	<instanceof value="org.eclipse.core.resources.IFile"/>	1504	<instanceof value="org.eclipse.core.resources.IFile"/>
1485	<test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>	1505	<test property="org.eclipse.core.resources.extension" value="umlclass"/>
		1506	</and>
		1507	<and>
		1508	<instanceof value="org.eclipse.core.resources.IFile"/>
		1509	<test property="org.eclipse.core.resources.extension" value=" umlclass_diagram"/>
1486	</and>	1510	</and>
1487	<instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>	1511	<instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
1488	<adapt type="org.eclipse.gmf.runtime.notation.View">	1512	<adapt type="org.eclipse.gmf.runtime.notation.View">
Lines 1505-1511 Link Here
1505	<or>	1529	<or>
1506	<and>	1530	<and>
1507	<instanceof value="org.eclipse.core.resources.IFile"/>	1531	<instanceof value="org.eclipse.core.resources.IFile"/>
1508	<test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>	1532	<test property="org.eclipse.core.resources.extension" value="umlclass"/>
		1533	</and>
		1534	<and>
		1535	<instanceof value="org.eclipse.core.resources.IFile"/>
		1536	<test property="org.eclipse.core.resources.extension" value=" umlclass_diagram"/>
1509	</and>	1537	</and>
1510	<instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>	1538	<instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
1511	</or>	1539	</or>

Lines 5-11 Link Here

(-)structures/classDiagram.gmfgen (-1 / +1 lines)
5	xmlns:gmfgen="http://www.eclipse.org/gmf/2006/GenModel"	5	xmlns:gmfgen="http://www.eclipse.org/gmf/2006/GenModel"
6	xmlns:uml2.gmfgenext="http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0" packageNamePrefix="org.eclipse.uml2.diagram.clazz"	6	xmlns:uml2.gmfgenext="http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0" packageNamePrefix="org.eclipse.uml2.diagram.clazz"
7	modelID="UMLClass"	7	modelID="UMLClass"
8	diagramFileExtension="umlclass_diagram"	8	diagramFileExtension="umlclass, umlclass_diagram"
9	dynamicTemplates="true"	9	dynamicTemplates="true"
10	templateDirectory="/org.eclipse.uml2.diagram.def/dynamic-templates/codegen">	10	templateDirectory="/org.eclipse.uml2.diagram.def/dynamic-templates/codegen">
11	<diagram	11	<diagram





«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»




/*
 * 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»




/*
 * 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»




/*
 * 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»




/*
 * 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»




/*
 * 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»




/*
 * 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(",")
;

Return to bug 230873

Lines 19-24 Link Here

(-)dynamic-templates/codegen/aspects/xpt/plugin/plugin.xpt (+47 lines)
19		19
20	«EXTENSION xpt::actions::Utils»	20	«EXTENSION xpt::actions::Utils»
21	«EXTENSION aspects::xpt::plugin::Utils»	21	«EXTENSION aspects::xpt::plugin::Utils»
		22	«EXTENSION aspects::xpt::FileExtensionUtils»
		23
		24	«AROUND plugin FOR gmfgen::GenPlugin-»
		25	<?xml version="1.0" encoding="UTF-8"?>
		26	<?eclipse version="3.0"?>
		27	«EXPAND xpt::Common::xcopyright FOR editorGen-»
		28	<plugin>
		29
		30	<extension point="org.eclipse.team.core.fileTypes">
		31	«EXPAND xpt::Common::xmlGeneratedTag»
		32	«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
		33	«FOREACH editorGen.collectAllExtensions() AS dfe-»
		34	<fileTypes
		35	type="text"
		36	extension="«dfe»">
		37	</fileTypes>
		38	«ENDFOREACH-»
		39	«REM» End of #230873«ENDREM-»
		40	</extension>
		41
		42	<extension point="org.eclipse.emf.ecore.extension_parser">
		43	«EXPAND xpt::Common::xmlGeneratedTag»
		44	«REM» #230873 'Make diagram file extension shorter'«ENDREM-»
		45	«FOREACH editorGen.collectAllExtensions() AS dfe-»
		46	<parser
		47	type="«dfe»"
		48	class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
		49	</parser>
		50	«ENDFOREACH-»
		51	«REM» End of #230873«ENDREM-»
		52	</extension>
		53
		54	«EXPAND xpt::editor::extensions::extensions FOR editorGen-»
		55	«EXPAND xpt::plugin::plugin::menu-»
		56	«EXPAND xpt::plugin::plugin::validation FOR editorGen.diagram-»
		57	«EXPAND xpt::plugin::plugin::metrics FOR editorGen.metrics-»
		58	«EXPAND xpt::diagram::preferences::extensions::extensions FOR editorGen.diagram-»
		59	«EXPAND xpt::propsheet::extensions::extensions FOR editorGen.propertySheet-»
		60	«EXPAND xpt::providers::extensions::extensions FOR editorGen.diagram-»
		61	«EXPAND xpt::navigator::extensions::extensions FOR editorGen.navigator-»
		62	«EXPAND xpt::application::extensions::extensions FOR editorGen.application-»
		63	«EXPAND xpt::ConstraintProviders::extensions FOR editorGen-»
		64	«EXPAND xpt::diagram::updater::extensions::extensions FOR editorGen.diagramUpdater-»
		65	«EXPAND xpt::plugin::plugin::additions-»
		66	</plugin>
		67	«ENDAROUND»
		68
22		69
23	«AROUND additions FOR gmfgen::GenPlugin»	70	«AROUND additions FOR gmfgen::GenPlugin»
24	«EXPAND contributionItemProviders FOREACH editorGen.diagram.topLevelNodes»	71	«EXPAND contributionItemProviders FOREACH editorGen.diagram.topLevelNodes»

Added Link Here

(-)dynamic-templates/codegen/aspects/xpt/editor/NewDiagramFileWizard.xpt (+167 lines)
1	/*
2	* Copyright (c) 2007 Borland Software Corporation
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Alexander Shatalin (Borland) - initial API and implementation
11	* Dmitry Stadnik (Borland) - rewritten in xpand
12	* Tatiana Fesenko (Borland) - fix for bugzilla #230873 'Make diagram file extension shorter'
13	*/
14
15	«IMPORT "http://www.eclipse.org/gmf/2006/GenModel"»
16	«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
17
18	«EXTENSION xpt::editor::Utils»
19	«EXTENSION aspects::xpt::FileExtensionUtils»
20
21	«AROUND NewDiagramFileWizard FOR gmfgen::GenDiagram-»
22	«EXPAND xpt::Common::copyright FOR editorGen-»
23	package «editorGen.editor.packageName»;
24
25	«EXPAND xpt::Common::generatedClassComment»
26	public class «EXPAND xpt::editor::NewDiagramFileWizard::className» extends org.eclipse.jface.wizard.Wizard {
27
28	«EXPAND xpt::Common::generatedMemberComment»
29	private «EXPAND xpt::editor::NewDiagramFileWizard::creationPage» myFileCreationPage;
30
31	«EXPAND xpt::Common::generatedMemberComment»
32	private «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» diagramRootElementSelectionPage;
33
34	«EXPAND xpt::Common::generatedMemberComment»
35	private org.eclipse.emf.transaction.TransactionalEditingDomain myEditingDomain;
36
37	«EXPAND xpt::Common::generatedMemberComment»
38	public «EXPAND xpt::editor::NewDiagramFileWizard::className»(org.eclipse.emf.common.util.URI domainModelURI,
39	org.eclipse.emf.ecore.EObject diagramRoot,
40	org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain) {
41	assert domainModelURI != null : "Domain model uri must be specified"; «EXPAND xpt::Common::nonNLS»
42	assert diagramRoot != null : "Doagram root element must be specified"; «EXPAND xpt::Common::nonNLS»
43	assert editingDomain != null : "Editing domain must be specified"; «EXPAND xpt::Common::nonNLS»
44
45	myFileCreationPage = new «EXPAND xpt::editor::NewDiagramFileWizard::creationPage»(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardCreationPage().nameKey()) FOR editorGen», org.eclipse.jface.viewers.StructuredSelection.EMPTY);
46	myFileCreationPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardCreationPage().titleKey()) FOR editorGen»);
47	myFileCreationPage.setDescription(org.eclipse.osgi.util.NLS.bind(
48	«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardCreationPage().descriptionKey()) FOR editorGen»,
49	«EXPAND xpt::editor::VisualIDRegistry::modelID»));
50	org.eclipse.core.runtime.IPath filePath;
51	String fileName = domainModelURI.trimFileExtension().lastSegment();
52	if (domainModelURI.isPlatformResource()) {
53	filePath = new org.eclipse.core.runtime.Path(domainModelURI.trimSegments(1).toPlatformString(true));
54	} else if (domainModelURI.isFile()) {
55	filePath = new org.eclipse.core.runtime.Path(domainModelURI.trimSegments(1).toFileString());
56	} else {
57	// TODO : use some default path
58	throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); «EXPAND xpt::Common::nonNLS»
59	}
60	myFileCreationPage.setContainerFullPath(filePath);
61	«REM» #230873 'Make diagram file extension shorter'
62	The only change is here. We take the first extension from the comma-separated list«ENDREM-»
63	myFileCreationPage.setFileName(«getDiagramEditorUtilQualifiedClassName()».getUniqueFileName(
64	filePath, fileName, "«editorGen.getDefaultDiagramExtension()»")); «EXPAND xpt::Common::nonNLS»
65	«REM»End of the only change«ENDREM-»
66	diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPage().nameKey()) FOR editorGen»);
67	diagramRootElementSelectionPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPage().titleKey()) FOR editorGen»);
68	diagramRootElementSelectionPage.setDescription(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPage().descriptionKey()) FOR editorGen»);
69	diagramRootElementSelectionPage.setModelElement(diagramRoot);
70
71	myEditingDomain = editingDomain;
72	}
73
74	«EXPAND xpt::Common::generatedMemberComment»
75	public void addPages() {
76	addPage(myFileCreationPage);
77	addPage(diagramRootElementSelectionPage);
78	}
79
80	«EXPAND xpt::Common::generatedMemberComment»
81	public boolean performFinish() {
82	java.util.List affectedFiles = new java.util.LinkedList();
83	«IF null == editorGen.application-»
84	org.eclipse.core.resources.IFile diagramFile = myFileCreationPage.createNewFile();
85	«EXPAND xpt::Common::setCharset("diagramFile")-»
86	affectedFiles.add(diagramFile);
87	org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);
88	«ELSE-»
89	org.eclipse.core.runtime.IPath diagramModelPath = myFileCreationPage.getContainerFullPath().append(myFileCreationPage.getFileName());
90	org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createFileURI(diagramModelPath.toString());
91	«ENDIF-»
92	org.eclipse.emf.ecore.resource.ResourceSet resourceSet = myEditingDomain.getResourceSet();
93	final org.eclipse.emf.ecore.resource.Resource diagramResource = resourceSet.createResource(diagramModelURI);
94	org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand command =
95	new org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand(
96	myEditingDomain, «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardInitDiagramCommand()) FOR editorGen», affectedFiles) {
97
98	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(
99	org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info)
100	throws org.eclipse.core.commands.ExecutionException {
101	int diagramVID = «EXPAND xpt::editor::VisualIDRegistry::getDiagramVisualIDMethodCall»(diagramRootElementSelectionPage.getModelElement());
102	if (diagramVID != «EXPAND xpt::editor::VisualIDRegistry::visualID») {
103	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newErrorCommandResult(
104	«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardIncorrectRootError()) FOR editorGen»);
105	}
106	org.eclipse.gmf.runtime.notation.Diagram diagram =
107	org.eclipse.gmf.runtime.diagram.core.services.ViewService.createDiagram(
108	diagramRootElementSelectionPage.getModelElement(), «EXPAND xpt::editor::VisualIDRegistry::modelID»,
109	«editorGen.plugin.getActivatorQualifiedClassName()».DIAGRAM_PREFERENCES_HINT);
110	diagramResource.getContents().add(diagram);
111	«IF editorGen.sameFileForDiagramAndModel-»
112	diagramResource.getContents().add(diagram.getElement());
113	«ENDIF-»
114	«IF !synchronized-»
115	new «getDiagramContentInitializerQualifiedClassName()»().initDiagramContent(diagram);
116	«ENDIF-»
117	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
118	}
119	};
120	try {
121	org.eclipse.core.commands.operations.OperationHistoryFactory.getOperationHistory().execute(
122	command, new org.eclipse.core.runtime.NullProgressMonitor(), null);
123	diagramResource.save(«EXPAND xpt::Common::getSaveOptions»);
124	«getDiagramEditorUtilQualifiedClassName()».openDiagram(diagramResource);
125	} catch (org.eclipse.core.commands.ExecutionException e) {
126	«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
127	"Unable to create model and diagram", e); «EXPAND xpt::Common::nonNLS»
128	} catch (java.io.IOException ex) {
129	«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
130	"Save operation failed for: " + diagramModelURI, ex); «EXPAND xpt::Common::nonNLS»
131	} catch (org.eclipse.ui.PartInitException ex) {
132	«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
133	"Unable to open editor", ex); «EXPAND xpt::Common::nonNLS»
134	}
135	return true;
136	}
137
138	«EXPAND xpt::Common::generatedClassComment»
139	private static class DiagramRootElementSelectionPage extends «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» {
140
141	«EXPAND xpt::Common::generatedMemberComment»
142	protected DiagramRootElementSelectionPage(String pageName) {
143	super(pageName);
144	}
145
146	«EXPAND xpt::Common::generatedMemberComment»
147	protected String getSelectionTitle() {
148	return «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle()) FOR editorGen»;
149	}
150
151	«EXPAND xpt::Common::generatedMemberComment»
152	protected boolean validatePage() {
153	if (selectedModelElement == null) {
154	setErrorMessage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage()) FOR editorGen»);
155	return false;
156	}
157	boolean result = org.eclipse.gmf.runtime.diagram.core.services.ViewService.getInstance().provides(
158	new org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation(
159	new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(selectedModelElement),
160	«EXPAND xpt::editor::VisualIDRegistry::modelID»,
161	«editorGen.plugin.getActivatorQualifiedClassName()».DIAGRAM_PREFERENCES_HINT));
162	setErrorMessage(result ? null : «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage()) FOR editorGen»);
163	return result;
164	}
165	}
166	}
167	«ENDAROUND»

Added Link Here

(-)dynamic-templates/codegen/aspects/xpt/FileExtensionUtils.ext (+25 lines)
1	/*
2	* Copyright (c) 2008 Borland Software Corporation
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	*/
10
11	import "http://www.eclipse.org/emf/2002/Ecore";
12	import "http://www.eclipse.org/gmf/2006/GenModel";
13
14	String getDefaultDiagramExtension(GenEditorGenerator generator) :
15	let extensions = collectAllExtensions(generator):
16	extensions.isEmpty() ? null : extensions.get(0)
17	;
18
19	List[String] collectAllExtensions(GenEditorGenerator generator) :
20	collectAllExtensions(generator.diagramFileExtension)
21	;
22
23	private List[String] collectAllExtensions(String extensionList) :
24	extensionList.split(",")
25	;