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

[Oliver Kellogg]

SVN commit 570525 by okellogg:

JP Fournier wrote:
>
> > OTOH, a JavaImport instance is created only each time the user
> > chooses the Import Code menubutton (see uml.cpp:1396 ff.)
>
> Actually this is no longer the case (see the JavaImport::spawnImport
> method). [...]

Yow! that totally escaped me.
I've made those variables static, could you try again?  Many thanks.


 M  +4 -1      javaimport.cpp  
 M  +2 -2      javaimport.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #570524:570525
@@ -29,9 +29,12 @@
 #include "../operation.h"
 #include "../attribute.h"
 
+QStringList JavaImport::m_filesAlreadyParsed;
+int JavaImport::m_parseDepth = 0;
+
 JavaImport::JavaImport() : NativeImportBase("//") {
     setMultiLineComment("/*", "*/");
-    m_parseDepth = 0;
+    //m_parseDepth = 0;
     initVars();
 }
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/javaimport.h #570524:570525
@@ -90,13 +90,13 @@
      * Keep track of the files we have already parsed so we don't
      * reparse the same ones over and over again.
      */
-    QStringList m_filesAlreadyParsed;
+    static QStringList m_filesAlreadyParsed;
 
     /**
      * Keep track of the parses so that the filesAlreadyParsed 
      * can be reset when we're done.
      */
-    int m_parseDepth;
+    static int m_parseDepth;
 
     /**
      * The current visibility for when the visibility is absent