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

[Oliver Kellogg]

SVN commit 493603 by okellogg:

apply commit 492999 from branches/KDE/3.5

 M  +1 -0      Makefile.am  
 AM            javaimport.cpp   [License: GPL (v2+)]
 AM            javaimport.h   [License: GPL (v2+)]
 M  +5 -0      uml.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/Makefile.am #493602:493603
@@ -52,6 +52,7 @@
 idlimport.cpp \
 import_utils.cpp \
 infowidget.cpp \
+javaimport.cpp \
 kstartuplogo.cpp \
 linepath.cpp \
 linkwidget.cpp \
** trunk/KDE/kdesdk/umbrello/umbrello/javaimport.cpp #property svn:executable
   + *
** trunk/KDE/kdesdk/umbrello/umbrello/javaimport.h #property svn:executable
   + *
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #493602:493603
@@ -52,6 +52,7 @@
 #include "cppimport.h"
 #include "idlimport.h"
 #include "adaimport.h"
+#include "javaimport.h"
 #include "docwindow.h"
 #include "codegenerator.h"
 #include "generatorinfo.h"
@@ -1385,6 +1386,8 @@
     QString preselectedExtension;
     if (m_activeLanguage == "IDL") {
         preselectedExtension = i18n("*.idl|IDL Files (*.idl)");
+    } else if (m_activeLanguage == "Java") {
+        preselectedExtension = i18n("*.java|Java Files (*.java)");
     } else if (m_activeLanguage == "Ada") {
         preselectedExtension = i18n("*.ads *.ada|Ada Files (*.ads *.ada)");
     } else {
@@ -1397,6 +1400,8 @@
     const QString& firstFile = fileList.first();
     if (firstFile.endsWith(".idl"))
         classImporter = new IDLImport();
+    else if (firstFile.endsWith(".java"))
+        classImporter = new JavaImport();
     else if (firstFile.contains( QRegExp("\\.ad[sba]$") ))
         classImporter = new AdaImport();
     else