svn commit: r19111 - trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java

Author: thn
Date: 2011-03-10 08:33:27-0800
New Revision: 19111

Modified:
   trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java

Log:
UML2: don't include primitive types in UML2 standard profile (causes problems)

Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java?view=diff&pathrev=19111&r1=19110&r2=19111
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java	2011-03-10 08:33:27-0800
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *    maurelio1234 - Initial implementation
- *    thn
+ *    Thomas Neustupny
  *    Tom Morris - lazy loading
  *****************************************************************************
  *
@@ -155,9 +155,7 @@
                 // by the following line the build-in eclipse UML2 standard
                 // profile and primitive types implementation are used.
                 model = Model.getUmlFactory().getExtentPackages(
-                        "pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml");
-                model.addAll(Model.getUmlFactory().getExtentPackages(
-                        "pathmap://UML_PROFILES/Standard.profile.uml"));
+                        "pathmap://UML_PROFILES/Standard.profile.uml");
             }
 
             if (model == null) {
@@ -521,14 +519,14 @@
                 if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
                     return ModelUtils.findTypeInModel("Integer", model
                             .iterator().next());
-                } else {
+                //} else {
                     // why Integer, better let's use String
                     // TODO: has nothing to do with tagged values
-                    for (Object t : Model.getExtensionMechanismsHelper().getCommonTaggedValueTypes()) {
-                        if ("String".equals(Model.getFacade().getName(t))) {
-                            return t;
-                        }
-                    }
+                //    for (Object t : Model.getExtensionMechanismsHelper().getCommonTaggedValueTypes()) {
+                //        if ("String".equals(Model.getFacade().getName(t))) {
+                //            return t;
+                //        }
+                //    }
                 }
                 // this must not happen
                 return null;

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

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