svn commit: r15213 - trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java

Author: mvw
Date: 2008-07-08 23:12:53-0700
New Revision: 15213

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java

Log:
Fix for issue 5211: Project fails to load (0.26.alpha2) due to conflicting XMI (MalformedXMIException). 

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java?view=diff&rev=15213&p1=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java&p2=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java&r1=15212&r2=15213
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java	2008-07-08 23:12:53-0700
@@ -138,21 +138,9 @@
             s = text.substring(start, end).trim();
             if (s.length() > 0) {
                 // yes, there are more:
-                Object model = project.getModel();
                 Object attrType = project.getDefaultAttributeType();
-                // Force type element into given namespace if not already there
-                // TODO: Dangerous! Why are we changing the model 
-                // as a side effect? - tfm 20070307
-                if (model != Model.getFacade().getNamespace(attrType)
-                        && !(Model.getModelManagementHelper().getAllNamespaces(
-                                model).contains(Model.getFacade().getNamespace(
-                                attrType)))) {
-                    Model.getCoreHelper().setNamespace(attrType, model);
-                }
-                
                 Object newAttribute = Model.getUmlFactory().buildNode(
                         Model.getMetaTypes().getAttribute());
-                
                 Model.getCoreHelper().setType(newAttribute, attrType);
                 
                 if (newAttribute != null) {