[Uml-devel] [Bug 123661] Java import fails at abstract methods or interfaces

[Oliver Kellogg]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=123661         
okellogg users sourceforge net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From okellogg users sourceforge net  2006-03-15 20:41 -------
SVN commit 518955 by okellogg:

parseStmt(): Check next token after method profile, it might be a semicolon.
Thanks to Harald Herres <harald.herres_AT_control.de> for the fix.
BUG:123661


 M  +1 -0      ChangeLog  
 M  +2 -1      THANKS  
 M  +10 -1     umbrello/javaimport.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #518954:518955
 @ -26,6 +26,7  @
 * Crash when creating a datatype with the same name as a class (122188)
 * Memory problem when importing classes from c++ sources (122668)
 * Crash when refusing to rename a class on importing typedef (122914)
+* Java import fails at abstract methods or interfaces (123661)
 
 Version 1.5.1
 
--- branches/KDE/3.5/kdesdk/umbrello/THANKS #518954:518955
 @ -33,8 +33,9  @
 Esben Mose Hansen <esben  despammed com>
 Olaf Hartig <OleBowle  gmx de>
 Marius Helf <marius.helf  gmx de>
+Paul Hensgen <phensgen  bigpond net au>
 Michel Hermier <michel.hermier  wanadoo fr>
-Paul Hensgen <phensgen  bigpond net au>
+Harald Herres <harald.herres  control de>
 David Hugh-Jones <hughjonesd  yahoo co uk>
 Pekka Jääskeläinen <pjaaskel  cs tut fi>
 Klas Kalass  <klas.kalass  gmx de>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/javaimport.cpp #518954:518955
 @ -309,7 +309,16  @
                                    m_isStatic, m_isAbstract, false /*isFriend*/,
                                    false /*isConstructor*/, m_comment);
         m_isAbstract = m_isStatic = false;
-        return skipToClosing('{');
+        // At this point we do not know whether the method has a body or not.
+        do {
+            nextToken = advance();
+        } while (nextToken != "{" && nextToken != ";");
+        if (nextToken == ";") {
+            // No body (interface or abstract)
+            return true;
+        } else {
+            return skipToClosing('{');
+        }
     }
     // At this point we know it's some kind of attribute declaration.
     while (1) {