Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 230873 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/uml2/diagram/clazz/part/UMLNewDiagramFileWizard.java (-1 / +1 lines)
Lines 72-78 Link Here
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
76
77
		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);
77
		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);
78
		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);
78
		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);
(-)src/org/eclipse/uml2/diagram/clazz/part/UMLUriEditorInputTester.java (-1 / +1 lines)
Lines 16-22 Link Here
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_diagram".equals(editorInput.getURI().fileExtension()) || "umlclass".equals(editorInput.getURI().fileExtension()); //$NON-NLS-1$
20
	}
20
	}
21
21
22
}
22
}
(-)src/org/eclipse/uml2/diagram/clazz/part/UMLCreationWizard.java (-1 / +1 lines)
Lines 99-105 Link Here
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);
(-)plugin.xml (+27 lines)
Lines 259-264 Link Here
259
         type="text"
259
         type="text"
260
         extension="umlclass_diagram">
260
         extension="umlclass_diagram">
261
      </fileTypes>
261
      </fileTypes>
262
      <fileTypes
263
         type="text"
264
         extension="umlclass">
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">
Lines 267-272 Link Here
267
         type="umlclass_diagram"
271
         type="umlclass_diagram"
268
         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
272
         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
269
      </parser>
273
      </parser>
274
      <parser
275
         type="umlclass"
276
         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
277
      </parser>
270
   </extension>
278
   </extension>
271
279
272
   <extension point="org.eclipse.ui.editors">
280
   <extension point="org.eclipse.ui.editors">
Lines 281-286 Link Here
281
         matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
289
         matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
282
         contributorClass="org.eclipse.uml2.diagram.clazz.part.UMLDiagramActionBarContributor">
290
         contributorClass="org.eclipse.uml2.diagram.clazz.part.UMLDiagramActionBarContributor">
283
      </editor>
291
      </editor>
292
      <editor
293
         id="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditorID"
294
         name="%editorName"
295
         icon="icons/obj16/UMLDiagramFile.gif"
296
         extensions="umlclass"
297
         default="true"
298
         class="org.eclipse.uml2.diagram.clazz.part.UMLDiagramEditor"
299
         matchingStrategy="org.eclipse.uml2.diagram.clazz.part.UMLMatchingStrategy"
300
         contributorClass="org.eclipse.uml2.diagram.clazz.part.UMLDiagramActionBarContributor">
301
      </editor>
284
   </extension>
302
   </extension>
285
303
286
	<extension point="org.eclipse.ui.contexts">
304
	<extension point="org.eclipse.ui.contexts">
Lines 547-552 Link Here
547
      <page
565
      <page
548
            id="org.eclipse.uml2.uml.diagram.clazz.general"
566
            id="org.eclipse.uml2.uml.diagram.clazz.general"
549
            name="%preference.page.title.org.eclipse.uml2.uml.diagram.clazz.general"
567
            name="%preference.page.title.org.eclipse.uml2.uml.diagram.clazz.general"
568
            category="org.eclipse.uml2.uml.diagram"
550
            class="org.eclipse.uml2.diagram.clazz.preferences.DiagramGeneralPreferencePage">
569
            class="org.eclipse.uml2.diagram.clazz.preferences.DiagramGeneralPreferencePage">
551
      </page>
570
      </page>
552
      <page
571
      <page
Lines 1483-1488 Link Here
1483
    	          <instanceof value="org.eclipse.core.resources.IFile"/>
1502
    	          <instanceof value="org.eclipse.core.resources.IFile"/>
1484
        	      <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
1503
        	      <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
1485
               </and>
1504
               </and>
1505
	           <and>
1506
    	          <instanceof value="org.eclipse.core.resources.IFile"/>
1507
        	      <test property="org.eclipse.core.resources.extension" value="umlclass"/>
1508
               </and>
1486
               <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
1509
               <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
1487
           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
1510
           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
1488
           	      <test property="org.eclipse.uml2.diagram.clazz.isShortcut"/>
1511
           	      <test property="org.eclipse.uml2.diagram.clazz.isShortcut"/>
Lines 1506-1511 Link Here
1506
    	             <instanceof value="org.eclipse.core.resources.IFile"/>
1529
    	             <instanceof value="org.eclipse.core.resources.IFile"/>
1507
        	         <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
1530
        	         <test property="org.eclipse.core.resources.extension" value="umlclass_diagram"/>
1508
                  </and>
1531
                  </and>
1532
	              <and>
1533
    	             <instanceof value="org.eclipse.core.resources.IFile"/>
1534
        	         <test property="org.eclipse.core.resources.extension" value="umlclass"/>
1535
                  </and>
1509
                  <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
1536
                  <instanceof value="org.eclipse.uml2.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
1510
               </or>
1537
               </or>
1511
            </parentExpression>
1538
            </parentExpression>
(-)plugin.properties (-5 / +5 lines)
Lines 20-28 Link Here
20
editorName=UMLClass Diagram Editor
20
editorName=UMLClass Diagram Editor
21
newWizardName=UMLClass Diagram
21
newWizardName=UMLClass Diagram
22
newWizardDesc=Creates UMLClass diagram.
22
newWizardDesc=Creates UMLClass diagram.
23
initDiagramActionLabel=Initialize umlclass_diagram diagram file
23
initDiagramActionLabel=Initialize umlclass diagram file
24
loadResourceActionLabel=Load Resource...
24
loadResourceActionLabel=Load Resource...
25
navigatorContentName=*.umlclass_diagram diagram contents
25
navigatorContentName=*.umlclass diagram contents
26
domainNavigatorContentName=*.uml model contents
26
domainNavigatorContentName=*.uml model contents
27
tab.appearance=Appearance
27
tab.appearance=Appearance
28
tab.diagram=Rulers & Grid
28
tab.diagram=Rulers & Grid
Lines 120-127 Link Here
120
120
121
metatype.name.PortProvided_4017=Undefined
121
metatype.name.PortProvided_4017=Undefined
122
metatype.name.PortRequired_4018=Undefined
122
metatype.name.PortRequired_4018=Undefined
123
123
124
preference.page.title.org.eclipse.uml2.uml.diagram.clazz.filters=View Filters
124
preference.page.title.org.eclipse.uml2.uml.diagram.clazz.filters=View Filters
125
125
126
preference.page.title.org.eclipse.uml2.uml.diagram.clazz.viewfilter=View Filters
126
preference.page.title.org.eclipse.uml2.uml.diagram.clazz.viewfilter=View Filters
127
127

Return to bug 230873