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

[Oliver Kellogg]

SVN commit 563652 by okellogg:

parseStmt(): The UMLObject found by createUMLObject might originally have been
created as a placeholder with a type of ot_Class but if is really an interface,
then we need to change it. Thanks to JP Fournier for the fix.
BUG:131006


 M  +1 -0      ChangeLog  
 M  +4 -0      umbrello/codeimport/javaimport.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #563651:563652
@@ -12,6 +12,7 @@
 * Java import: method and class visibility ignored (130794)
 * Java import - static not handled correctly (130926)
 * Java import - package visibility incorrectly represented (130932)
+* Java import - random import order can result in interface being teated as class (131006)
 
 Version 1.5.3
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #563651:563652
@@ -156,6 +156,10 @@
         m_klass->setAbstract(m_isAbstract);
         m_klass->setStatic(m_isStatic);
         m_klass->setVisibility(m_currentAccess);
+        // The UMLObject found by createUMLObject might originally have been created as a
+        // placeholder with a type of class but if is really an interface, then we need to
+        // change it.
+        m_klass->setInterface(keyword == "interface");
         m_isAbstract = m_isStatic = false;
         if (advance() == ";")   // forward declaration
             return true;