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

[Oliver Kellogg]

SVN commit 575626 by okellogg:

insertAttribute(): According to JP Fournier, attributes are legitimate members
 of interfaces in Java.
BUG:132657


 M  +1 -0      ChangeLog  
 M  +2 -1      umbrello/codeimport/import_utils.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #575625:575626
@@ -10,6 +10,7 @@
 * Java import - array types not resolved correctly (132035)
 * Java import - "final" and comments in method declaration
   not parsed correctly (132174)
+* Java import - static member vars ignored in interfaces (132657)
 
 Version 1.5.4
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/import_utils.cpp #575625:575626
@@ -236,7 +236,8 @@
                                         UMLClassifier *attrType, QString comment /* ="" */,
                                         bool isStatic /* =false */) {
     Uml::Object_Type ot = owner->getBaseType();
-    if (ot != Uml::ot_Class) {
+    Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage();
+    if (ot != Uml::ot_Class && pl != Uml::pl_Java) {
         kdDebug() << "insertAttribute: Don't know what to do with "
         << owner->getName() << " (object type " << ot << ")" << endl;
         return NULL;