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

[Oliver Kellogg]

SVN commit 605677 by okellogg:

getPackage(): Set separator to language dependent default if empty.
BUG:137497


 M  +2 -1      ChangeLog  
 M  +4 -10     umbrello/umlobject.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #605676:605677
@@ -1,4 +1,4 @@
-Version 1.5.52
+Version 1.5.6
 
 * Fixed segfault in UMLClassifier::checkOperationSignature()
   (http://www.geeksoc.org/~jr/umbrello/uml-devel/9816.html)
@@ -8,6 +8,7 @@
 * Fixed bugs in generated code of various code generators
 * Bugs/wishes from http://bugs.kde.org:
 * Shift + Left and Shift+Right causes SIGSEGV (136288)
+* Faulty behavior when a class inside of a package is modified (137497)
 
 Version 1.5.51
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlobject.cpp #605676:605677
@@ -113,17 +113,9 @@
         bool skipPackage = false;
         if (!includeRoot) {
             UMLDoc *umldoc = UMLApp::app()->getDocument();
-            if (m_pUMLPackage == umldoc->getDatatypeFolder()) {
+            if (umldoc->rootFolderType(m_pUMLPackage) != Uml::N_MODELTYPES ||
+                m_pUMLPackage == umldoc->getDatatypeFolder())
                 skipPackage = true;
-            } else {
-                for (int i = 0; i < Uml::N_MODELTYPES; i++) {
-                    const Uml::Model_Type mt = (Uml::Model_Type)i;
-                    if (m_pUMLPackage == umldoc->getRootFolder(mt)) {
-                        skipPackage = true;
-                        break;
-                    }
-                }
-            }
         }
         if (!skipPackage) {
             if (separator.isEmpty())
@@ -344,6 +336,8 @@
 }
 
 QString UMLObject::getPackage(QString separator, bool includeRoot) {
+    if (separator.isEmpty())
+        separator = UMLApp::app()->activeLanguageScopeSeparator();
     QString fqn = getFullyQualifiedName(separator, includeRoot);
     if (!fqn.contains(separator))
         return "";