Attachment 99058 Details for Bug 230873 – Simple patch

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

[patch] Simple patch

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

on 2008-05-07 08:25:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tatiana Fesenko

Created: 2008-05-07 08:25:52 EDT

Size: 7.87 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 12:21:03 -0000
>@@ -72,7 +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);
>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 12:21:03 -0000
>@@ -16,7 +16,7 @@
> 			return false;
> 		}
> 		URIEditorInput editorInput = (URIEditorInput) receiver;
>-		return "umlclass_diagram".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$
>+		return "umlclass_diagram".equals(editorInput.getURI().fileExtension()) || "umlclass".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 12:21:03 -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.42
>diff -u -r1.42 plugin.xml
>--- plugin.xml	6 Mar 2008 13:47:58 -0000	1.42
>+++ plugin.xml	7 May 2008 12:21:03 -0000
>@@ -259,6 +259,10 @@
>          type="text"
>          extension="umlclass_diagram">
>       </fileTypes>
>+      <fileTypes
>+         type="text"
>+         extension="umlclass">
>+      </fileTypes>
>    </extension>
> 
>    <extension point="org.eclipse.emf.ecore.extension_parser">
>@@ -267,6 +271,10 @@
>          type="umlclass_diagram"
>          class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
>       </parser>
>+      <parser
>+         type="umlclass"
>+         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
>+      </parser>
>    </extension>
> 
>    <extension point="org.eclipse.ui.editors">
>@@ -281,6 +289,16 @@
>          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"
>+         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>
>    </extension>
> 
> 	<extension point="org.eclipse.ui.contexts">
>@@ -547,6 +565,7 @@
>       <page
>             id="org.eclipse.uml2.uml.diagram.clazz.general"
>             name="%preference.page.title.org.eclipse.uml2.uml.diagram.clazz.general"
>+            category="org.eclipse.uml2.uml.diagram"
>             class="org.eclipse.uml2.diagram.clazz.preferences.DiagramGeneralPreferencePage">
>       </page>
>       <page
>@@ -1483,6 +1502,10 @@
>     	          <instanceof value="org.eclipse.core.resources.IFile"/>
>         	      <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
>                </and>
>+	           <and>
>+    	          <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	      <test property="org.eclipse.core.resources.extension" value="umlclass"/>
>+               </and>
>                <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
>            	   <adapt type="org.eclipse.gmf.runtime.notation.View">
>            	      <test property="org.eclipse.uml2.diagram.clazz.isShortcut"/>
>@@ -1506,6 +1529,10 @@
>     	             <instanceof value="org.eclipse.core.resources.IFile"/>
>         	         <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
>                   </and>
>+	              <and>
>+    	             <instanceof value="org.eclipse.core.resources.IFile"/>
>+        	         <test property="org.eclipse.core.resources.extension" value="umlclass"/>
>+                  </and>
>                   <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
>                </or>
>             </parentExpression>
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.clazz/plugin.properties,v
>retrieving revision 1.26
>diff -u -r1.26 plugin.properties
>--- plugin.properties	6 Mar 2008 13:47:58 -0000	1.26
>+++ plugin.properties	7 May 2008 12:21:03 -0000
>@@ -20,9 +20,9 @@
> 
editorName=UMLClass Diagram Editor
> newWizardName=UMLClass Diagram
> newWizardDesc=Creates UMLClass diagram.
>-
initDiagramActionLabel=Initialize umlclass_diagram diagram file
>+
initDiagramActionLabel=Initialize umlclass diagram file
> loadResourceActionLabel=Load Resource...
>-
navigatorContentName=*.umlclass_diagram diagram contents
>+
navigatorContentName=*.umlclass diagram contents
> domainNavigatorContentName=*.uml model contents
> 
tab.appearance=Appearance
> tab.diagram=Rulers & Grid
>@@ -120,8 +120,8 @@
> 
> metatype.name.PortProvided_4017=Undefined
> metatype.name.PortRequired_4018=Undefined
>-
>+
> preference.page.title.org.eclipse.uml2.uml.diagram.clazz.filters=View Filters
>-
>+
> preference.page.title.org.eclipse.uml2.uml.diagram.clazz.viewfilter=View Filters
>-
>+

Actions: View | Diff

Attachments on bug 230873: 99058 | 99172