[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 706925 by okellogg:

loadFromXMI(): Revert automatic generation of new xmi.id on
reuse of existing ID of UMLRole.
This is an XMI corruption that should be fixed manually.


 M  +2 -3      umlobject.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #706924:706925
@@ -624,9 +624,8 @@
             // If the xmi.id is already being used then we generate a new one.
             UMLObject *o = umldoc->findObjectById(m_nId);
             if (o) {
-                kDebug() << "loadFromXMI(UMLRole): id " << id
-                    << " is already in use, generating a new one." << endl;
-                m_nId = UniqueID::gen();
+                kError() << "loadFromXMI(UMLRole): id " << id
+                    << " is already in use!!! Please fix your XMI file." << endl;
             }
         }
     }