Attachment 54662 Details for Bug 150154 – 3 of 4

[patch] 3 of 4

datatype_org.eclipse.uml2.examples.uml.ui.patch (text/plain), 13.07 KB, created by James Bruck

on 2006-11-28 14:20:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: James Bruck

Created: 2006-11-28 14:20:50 EST

Size: 13.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.uml2.examples.uml.ui
>Index: src/org/eclipse/uml2/examples/uml/ui/actions/GenerateModelAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.uml2/examples/org.eclipse.uml2.examples.uml.ui/src/org/eclipse/uml2/examples/uml/ui/actions/GenerateModelAction.java,v
>retrieving revision 1.2
>diff -u -r1.2 GenerateModelAction.java
>--- src/org/eclipse/uml2/examples/uml/ui/actions/GenerateModelAction.java	10 Oct 2006 20:40:47 -0000	1.2
>+++ src/org/eclipse/uml2/examples/uml/ui/actions/GenerateModelAction.java	28 Nov 2006 18:18:37 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.emf.common.command.IdentityCommand;
> import org.eclipse.emf.common.command.UnexecutableCommand;
> import org.eclipse.emf.edit.domain.EditingDomain;
>+import org.eclipse.uml2.uml.DataType;
> import org.eclipse.uml2.uml.Model;
> import org.eclipse.uml2.uml.PrimitiveType;
> import org.eclipse.uml2.uml.UMLPackage;
>@@ -43,5 +44,11 @@
> 		return (PrimitiveType) package_.getPackagedElement(name, false,
> 			UMLPackage.Literals.PRIMITIVE_TYPE, true);
> 	}
>+	
>+	protected DataType generateOwnedDataType(
>+			org.eclipse.uml2.uml.Package package_, String name) {
>+		return (DataType) package_.getPackagedElement(name, false,
>+			UMLPackage.Literals.DATA_TYPE, true);
>+	}
> 
> }
>Index: src/org/eclipse/uml2/examples/uml/ui/actions/GenerateEcoreStereotypesAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.uml2/examples/org.eclipse.uml2.examples.uml.ui/src/org/eclipse/uml2/examples/uml/ui/actions/GenerateEcoreStereotypesAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 GenerateEcoreStereotypesAction.java
>--- src/org/eclipse/uml2/examples/uml/ui/actions/GenerateEcoreStereotypesAction.java	10 Oct 2006 20:40:47 -0000	1.3
>+++ src/org/eclipse/uml2/examples/uml/ui/actions/GenerateEcoreStereotypesAction.java	28 Nov 2006 18:18:37 -0000
>@@ -42,33 +42,33 @@
> 							profile, UMLPackage.Literals.PACKAGE);
> 						generateExtension(ePackageStereotype, packageMetaclass,
> 							false);
>-						PrimitiveType stringPrimitiveType = getImportedUMLPrimitiveType(
>+						PrimitiveType stringUMLPrimitiveType = getImportedUMLPrimitiveType(
> 							profile, "String"); //$NON-NLS-1$
> 						generateOwnedAttribute(ePackageStereotype,
> 							"packageName", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 						generateOwnedAttribute(ePackageStereotype, "nsPrefix", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 						generateOwnedAttribute(ePackageStereotype, "nsURI", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 						generateOwnedAttribute(ePackageStereotype,
> 							"basePackage", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 						generateOwnedAttribute(ePackageStereotype, "prefix", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 
> 						Stereotype eNamedElementStereotype = generateOwnedStereotype(
> 							profile, "ENamedElement", true); //$NON-NLS-1$
> 						generateOwnedAttribute(eNamedElementStereotype,
> 							"xmlName", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 
> 						Stereotype eClassifierStereotype = generateOwnedStereotype(
> 							profile, "EClassifier", true); //$NON-NLS-1$
> 						generateGeneralization(eClassifierStereotype,
> 							eNamedElementStereotype);
> 						generateOwnedAttribute(eClassifierStereotype,
>-							"instanceClassName", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"instanceClassName", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 
> 						Enumeration contentKindEnumeration = generateOwnedEnumeration(
> 							profile, "ContentKind"); //$NON-NLS-1$
>@@ -95,7 +95,7 @@
> 						generateGeneralization(eClassStereotype,
> 							eClassifierStereotype);
> 						generateOwnedAttribute(eClassStereotype, "className", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 						generateOwnedAttribute(eClassStereotype,
> 							"xmlContentKind", //$NON-NLS-1$
> 							contentKindEnumeration, 0, 1);
>@@ -108,11 +108,15 @@
> 							profile, UMLPackage.Literals.PRIMITIVE_TYPE);
> 						generateExtension(eDataTypeStereotype,
> 							primitiveTypeMetaclass, false);
>+						org.eclipse.uml2.uml.Class dataTypeMetaclass = getReferencedUMLMetaclass(
>+							profile, UMLPackage.Literals.DATA_TYPE);
>+						generateExtension(eDataTypeStereotype,
>+							dataTypeMetaclass, false);
> 						generateGeneralization(eDataTypeStereotype,
> 							eClassifierStereotype);
> 						generateOwnedAttribute(eDataTypeStereotype,
> 							"dataTypeName", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 
> 						Stereotype eEnumStereotype = generateOwnedStereotype(
> 							profile, "EEnum", false); //$NON-NLS-1$
>@@ -125,7 +129,7 @@
> 						generateGeneralization(eEnumStereotype,
> 							eNamedElementStereotype);
> 						generateOwnedAttribute(eEnumStereotype, "enumName", //$NON-NLS-1$
>-							stringPrimitiveType, 0, 1);
>+							stringUMLPrimitiveType, 0, 1);
> 
> 						Stereotype eEnumLiteralStereotype = generateOwnedStereotype(
> 							profile, "EEnumLiteral", false); //$NON-NLS-1$
>@@ -138,7 +142,7 @@
> 						generateGeneralization(eEnumLiteralStereotype,
> 							eNamedElementStereotype);
> 						generateOwnedAttribute(eEnumLiteralStereotype,
>-							"enumLiteralName", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"enumLiteralName", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 
> 						Stereotype eOperationStereotype = generateOwnedStereotype(
> 							profile, "EOperation", false); //$NON-NLS-1$
>@@ -149,7 +153,7 @@
> 						generateExtension(eOperationStereotype,
> 							operationMetaclass, false);
> 						generateOwnedAttribute(eOperationStereotype,
>-							"operationName", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"operationName", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 
> 						Stereotype eParameterStereotype = generateOwnedStereotype(
> 							profile, "EParameter", false); //$NON-NLS-1$
>@@ -160,7 +164,7 @@
> 						generateExtension(eParameterStereotype,
> 							parameterMetaclass, false);
> 						generateOwnedAttribute(eParameterStereotype,
>-							"parameterName", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"parameterName", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 
> 						Enumeration featureKindEnumeration = generateOwnedEnumeration(
> 							profile, "FeatureKind"); //$NON-NLS-1$
>@@ -203,7 +207,7 @@
> 						generateOwnedAttribute(eStructuralFeatureStereotype,
> 							"isUnsettable", booleanPrimitiveType, 0, 1); //$NON-NLS-1$
> 						generateOwnedAttribute(eStructuralFeatureStereotype,
>-							"xmlNamespace", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"xmlNamespace", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 						generateOwnedAttribute(eStructuralFeatureStereotype,
> 							"xmlFeatureKind", featureKindEnumeration, 0, 1); //$NON-NLS-1$
> 						generateOwnedAttribute(eStructuralFeatureStereotype,
>@@ -220,7 +224,7 @@
> 						generateGeneralization(eAttributeStereotype,
> 							eStructuralFeatureStereotype);
> 						generateOwnedAttribute(eAttributeStereotype,
>-							"attributeName", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"attributeName", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 						generateOwnedAttribute(eAttributeStereotype,
> 							"isID", booleanPrimitiveType, 0, 1); //$NON-NLS-1$
> 
>@@ -233,7 +237,7 @@
> 						generateGeneralization(eReferenceStereotype,
> 							eStructuralFeatureStereotype);
> 						generateOwnedAttribute(eReferenceStereotype,
>-							"referenceName", stringPrimitiveType, 0, 1); //$NON-NLS-1$
>+							"referenceName", stringUMLPrimitiveType, 0, 1); //$NON-NLS-1$
> 						generateOwnedAttribute(eReferenceStereotype,
> 							"isResolveProxies", booleanPrimitiveType, 0, 1) //$NON-NLS-1$
> 							.setBooleanDefaultValue(true);
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.uml2/examples/org.eclipse.uml2.examples.uml.ui/plugin.properties,v
>retrieving revision 1.5
>diff -u -r1.5 plugin.properties
>--- plugin.properties	10 Jun 2006 20:29:47 -0000	1.5
>+++ plugin.properties	28 Nov 2006 18:18:37 -0000
>@@ -48,6 +48,8 @@
> 
> _UI_PrimitiveTypesMenu_label = &Primitive Types
> 
>+_UI_DataTypesMenu_label = &Data Types
>+
> _UI_StereotypesMenu_label = &Stereotypes
> 
> _UI_EcoreAction_label = &Ecore
>@@ -66,6 +68,9 @@
> _UI_UMLAction_label = &UML
> _UI_GenerateUMLPrimitiveTypesActionCommand_label = Generate UML Primitive Types into Model {0}
> 
>+_UI_XMLAction_label = &XML
>+_UI_GenerateXMLDataTypesActionCommand_label = Generate XML Data Types into Model {0}
>+
> _UI_ExternalizeMenu_label = E&xternalize
> 
> _UI_KeywordsAction_label = &Keywords
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.uml2/examples/org.eclipse.uml2.examples.uml.ui/plugin.xml,v
>retrieving revision 1.4
>diff -u -r1.4 plugin.xml
>--- plugin.xml	25 Apr 2006 20:58:28 -0000	1.4
>+++ plugin.xml	28 Nov 2006 18:18:37 -0000
>@@ -127,6 +127,18 @@
>           </objectClass>
>         </enablement>
>       </action>
>+       <action
>+         label="%_UI_XMLAction_label"
>+         class="org.eclipse.uml2.examples.uml.ui.actions.GenerateXMLDataTypesAction"
>+         menubarPath="org.eclipse.uml2.umlMenuID/org.eclipse.uml2.examples.uml.ui.GenerateMenuID/org.eclipse.uml2.examples.uml.ui.DataTypesMenuID/additions"
>+         enablesFor="1"
>+         id="org.eclipse.uml2.examples.uml.ui.GenerateXMLDataTypesActionID">
>+        <enablement>
>+          <objectClass
>+             name="org.eclipse.uml2.uml.Model">
>+          </objectClass>
>+        </enablement>
>+      </action>
>       <menu
>          label="%_UI_ExternalizeMenu_label"
>          path="org.eclipse.uml2.umlMenuID/additions-end"
>@@ -199,6 +211,14 @@
>           </objectClass>
>         </enablement>
>       </action>
>+      <menu
>+            id="org.eclipse.uml2.examples.uml.ui.DataTypesMenuID"
>+            label="%_UI_DataTypesMenu_label"
>+            path="org.eclipse.uml2.umlMenuID/org.eclipse.uml2.examples.uml.ui.GenerateMenuID/additions">
>+         <separator
>+               name="additions">
>+         </separator>
>+      </menu>
>     </editorContribution>
>   </extension>
> 
>Index: src/org/eclipse/uml2/examples/uml/ui/actions/GenerateXMLDataTypesAction.java
>===================================================================
>RCS file: src/org/eclipse/uml2/examples/uml/ui/actions/GenerateXMLDataTypesAction.java
>diff -N src/org/eclipse/uml2/examples/uml/ui/actions/GenerateXMLDataTypesAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/examples/uml/ui/actions/GenerateXMLDataTypesAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,68 @@
>+/*
>+ * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * 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:
>+ *   IBM - initial API and implementation
>+ *
>+ * $Id: GenerateXMLDataTypesAction.java,v 1.2 2006/10/10 20:40:47 khussey Exp $
>+ */
>+package org.eclipse.uml2.examples.uml.ui.actions;
>+
>+import java.util.Iterator;
>+
>+import org.eclipse.emf.common.command.UnexecutableCommand;
>+import org.eclipse.emf.ecore.EDataType;
>+import org.eclipse.emf.ecore.EEnum;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.util.EcoreSwitch;
>+import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
>+import org.eclipse.jface.action.IAction;
>+import org.eclipse.uml2.common.edit.command.ChangeCommand;
>+import org.eclipse.uml2.examples.uml.ui.UMLExamplesUIPlugin;
>+import org.eclipse.uml2.uml.Model;
>+
>+public class GenerateXMLDataTypesAction extends GenerateModelAction {
>+	public void run(IAction action) {
>+
>+		if (command != UnexecutableCommand.INSTANCE) {
>+			final Model model = (Model) collection.iterator().next();
>+
>+			editingDomain.getCommandStack().execute(
>+				new ChangeCommand(editingDomain, new Runnable() {
>+
>+					public void run() {
>+
>+						new EcoreSwitch() {
>+
>+							public Object caseEDataType(EDataType eDataType) {
>+								return generateOwnedDataType(model,
>+									eDataType.getName());
>+							}
>+
>+							public Object caseEEnum(EEnum eEnum) {
>+								return eEnum;
>+							}
>+
>+							public Object defaultCase(EObject eObject) {
>+
>+								for (Iterator eContents = eObject.eContents()
>+									.iterator(); eContents.hasNext();) {
>+
>+									doSwitch((EObject) eContents.next());
>+								}
>+
>+								return eObject;
>+							}
>+						}.doSwitch(XMLTypePackage.eINSTANCE);
>+					}
>+				}, UMLExamplesUIPlugin.INSTANCE.getString(
>+					"_UI_GenerateXMLDataTypesActionCommand_label", //$NON-NLS-1$
>+					new Object[]{getLabelProvider().getText(model)})));
>+		}
>+	}
>+
>+}

Actions: View | Diff

Attachments on bug 150154: 54660 | 54661 | 54662 | 54663 | 54732 | 54749