[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 663381 by okellogg:

fixed by Sharan in commit 663342
BUG:144537


 M  +4 -3      ChangeLog.2  
 M  +2 -0      THANKS  
 M  +8 -1      umbrello/umldoc.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog.2 #663380:663381
@@ -2,6 +2,9 @@
 
 * Bugs/wishes from http://bugs.kde.org:
 * Turn off header/footer and page numbers when printing (69113)
+* Code generation and undo/redo take up too much memory (72644)
+  - Use the KUndoStack derived from QT4 QUndoStack in order to manage commands.
+  - Commands are stored in cmds folder.
 * Recursively scan source files when reverse engineering (109157)
 * Implement the UML 2.0 standard (115269)
   - Sequence Diagram
@@ -24,7 +27,5 @@
         * Central buffer nodes.
         * Data stores nodes.
         * Input / Output / Constant Pins.
+* RMB LogicalView->New->Class in treeview creates TWO classes (144537)
 
-* Code generation and undo/redo take up too much memory (72644)
-  - Use the KUndoStack derived from QT4 QUndoStack in order to manage commands.
-  - Commands are stored in cmds folder.
--- trunk/KDE/kdesdk/umbrello/THANKS #663380:663381
@@ -64,6 +64,7 @@
 Ivan Porres <iporres @abo.fi>
 Maciej Puzio <maciek @work.swmed.edu>
 Ruediger Ranft <kdebugs @rranft1.mail.htwm.de>
+Sharan Rao <sharanrao @gmail.com>
 John Ratke <jratke @comcast.net>
 Vincent Ricard <magic @magicninja.org>
 Daniel Richard G. <skunk @iskunk.org>
@@ -77,6 +78,7 @@
 Sebastian Stein <seb.stein @gmx.de>
 Andrew Sutton <asutton @cs.kent.edu>
 Tanuj <tagrawal @hss.hns.com>
+Tonton <tonton-lists @team1664.org>
 Brian Thomas <brian.thomas @gsfc.nasa.gov>
 Ferenc Veres <lion @netngine.hu>
 Jean Vittor <jean.vittor @wanadoo.fr>
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #663380:663381
@@ -1290,8 +1290,15 @@
 
     // Save stereotypes and toplevel datatypes first so that upon loading
     // they are known first.
+    // There is a bug causing duplication of the same stereotype in m_stereoList.
+    // As a workaround, we use a string list to memorize which stereotype has been saved.
+    QStringList stereoNames;
     for (UMLStereotype *s = m_stereoList.first(); s; s = m_stereoList.next() ) {
-        s->saveToXMI(doc, ownedNS);
+        QString stName = s->getName();
+        if (!stereoNames.contains(stName)) {
+            s->saveToXMI(doc, ownedNS);
+            stereoNames.append(stName);
+        }
     }
     for (int i = 0; i < Uml::N_MODELTYPES; i++) {
         m_root[i]->saveToXMI(doc, ownedNS);