svn commit: r17433 - trunk/src/argouml-core-model-euml: . src/org/argouml/model/euml

Author: thn
Date: 2009-10-30 11:01:00-0700
New Revision: 17433

Modified:
   trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java

Log:
make setting base class for stereotypes working

Modified: trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/ArgoUML%20UML2-EUML%20debug.launch?view=diff&pathrev=17433&r1=17432&r2=17433
==============================================================================
--- trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch	(original)
+++ trunk/src/argouml-core-model-euml/ArgoUML UML2-EUML debug.launch	2009-10-30 11:01:00-0700
@@ -54,5 +54,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.application.Main"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nouml2warning"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-app"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dargouml.modules=org.argouml.sequence2.SequenceDiagramModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf  -Dargouml.model.implementation=org.argouml.model.euml.EUMLModelImplementation"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dargouml.modules=org.argouml.sequence2.SequenceDiagramModule -Dlog4j.configuration=org/argouml/resource/full_console.lcf  -DeUML.resources=../argouml-core-model-euml/lib/uml2/org.eclipse.uml2.uml.resources_3.0.0.v200906011111.jar -Dargouml.model.implementation=org.argouml.model.euml.EUMLModelImplementation"/>
 </launchConfiguration>

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java?view=diff&pathrev=17433&r1=17432&r2=17433
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java	2009-10-30 11:01:00-0700
@@ -172,29 +172,4 @@
         // TODO: Auto-generated method stub
         return null;
     }
-
-    public static UMLPackage getUMLMetamodel() {
-        if (metamodel == null) {
-            // load metamodel
-            metamodel = UMLPackage.eINSTANCE;
-        }
-        return metamodel;
-    }
-
-    private static Model loadUMLMetamodel(EUMLModelImplementation model) {
-        Model m = null;
-        try {
-            Resource res = (new ResourceSetImpl()).createResource(URI
-                    .createURI(UMLResource.UML_METAMODEL_URI));
-            //Resource res = UMLUtil.getResource(model, URI
-            //        .createURI(UMLResource.UML_METAMODEL_URI), true);
-            Object o = EcoreUtil.getObjectByType(res.getContents(),
-                    UMLPackage.Literals.PACKAGE);
-            m = (Model) o;
-            LOG.debug("no. of resources: " + res.getContents().size());
-        } catch (WrappedException we) {
-            LOG.warn("Failed getting UML metamodel");
-        }
-        return m;
-    }
 }

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java?view=diff&pathrev=17433&r1=17432&r2=17433
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java	2009-10-30 11:01:00-0700
@@ -32,12 +32,14 @@
 import org.argouml.model.ExtensionMechanismsHelper;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Model;
 import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.resource.UMLResource;
 
 /**
  * The implementation of the ExtensionMechanismsHelper for EUML2.
@@ -64,12 +66,10 @@
             Profile profile = (Profile) modelImpl.getFacade().getRoot(handle);
             org.eclipse.uml2.uml.Class metaclass = null;
             if (profile != null && baseClass instanceof String) {
-                // metaclass =
-                // (org.eclipse.uml2.uml.Class)
-                // ExtensionMechanismsFactoryEUMLImpl
-                // .getUMLMetamodel(). .getOwnedType((String) baseClass);
-                Resource res = modelImpl.getEditingDomain().getResourceSet()
-                        .getResource(URI.createURI(UMLPackage.eNS_URI), true);
+                URI uri = URI.createURI(UMLResource.UML_METAMODEL_URI);
+                ResourceSet rs = modelImpl.getEditingDomain().getResourceSet();
+                // this line takes long on first call: (put it elsewhere?)
+                Resource res = rs.getResource(uri, true);
                 Model m = (Model) EcoreUtil.getObjectByType(res.getContents(),
                         UMLPackage.Literals.PACKAGE);
                 metaclass = (org.eclipse.uml2.uml.Class) m
@@ -197,7 +197,7 @@
     public void setDataValues(Object handle, String[] value) {
         // TODO: Auto-generated method stub
     }
-    
+
     public Object makeProfileApplicable(Object handle) {
         Object result = null;
         if (handle instanceof Profile) {

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2413074

To unsubscribe from this discussion, e-mail: [[email protected]].