Imporvement of performance : Reduce the Java running count (3rd trial)

# What is it
- #6465 is the first trial.  So I followed up the albert advice.
	- in case of debug you use printf statements, I think that here there better options would be
		- create an -d flag (e.g. -d plantuml) that gives the information, so no need for using the configuration option
		- Follow up : create -d plantuml [debug.h, debug.cpp]
	- usage of printf
		- printf should not be used,all output is steered over calls to routines as defined in message.cpp,
		- Follow up : use Debug::Print(Debug::Plantuml, ...    and msg()
	- usage of std::string / std::map
		- in doxygen the string manipulation is. mostly, done by means of Qt classes (e.g. classes QCString, QString). For consistency these classes should be used.
		- map manipulation is also done by means of Qt classes (dictionary and list classes)
		- Follow up : use QDict QList QCString [plantuml.h, plantuml.cpp]
	- dirent / opendir /readdir
		- when browsing through directories the routines line readFileOrDirectory should probably be used or the techniques used in this routine
		- Follow up : I will follow when I try to reduce redundancy of creating plantuml image.
- #6467 is the second trial.  This is work items to satisfiy comments.
	- In the debug statements the __PRETTY_FUNCTION__ is a GCC extension. But this project can run in windows.
		- I got it.  I removed __PRETTY_FUNCTION__.
	- In the PLANTUML_RUN_JAVA_ONCE all the .pu files are given to the plantuml.jar with their full path (see -d extcmd when running). I think this will lead to problems when there are quite a few files ("command line" overflow). Seen this merging the files into one file like done for formulas. A small test with one file revealed that it didn't bring a lot / nothing time wise, but here the problem with the "command line" overflow shouldn't / can't happen.
		- Yes. The command line has overflow problem.  So I change into one file.
	- I think it still would make sense to implement the 'md5' possibility for, especially, the non PLANTUML_RUN_JAVA_ONCE version, i.e. if the file already exists don't try to recreate the image.
		- This is a next item.
			- PlantumlManager::instance()->insert() : this function will be changed to skip image.

# Configuration
- add configuration value in Doxyfile
	- PLANTUML_RUN_JAVA_ONCE = YES

# Debugging
- doxygen -d plantuml
- doxygen -d time -d extcmd

# Tested with following options
- source code of 3 plantuml
- PLANTUML_RUN_JAVA_ONCE = YES  or    NO
- DOT_IMAGE_FORMAT       = png  or    svg
- DOT_CLEANUP            = YES  or    NO
- -d plantuml
- -d time
- -d extcmd

1 files changed, 3 insertions, 116 deletions

diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index 3742ced..23601f5 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -34,7 +34,6 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
   QCString imgName(4096);
   static int umlindex=1;
 
-  //printf("*** %s fileName: %s\n","writePlantUMLSource",qPrint(fileName));
   Debug::print(Debug::Plantuml,0,"*** %s fileName: %s\n","writePlantUMLSource",qPrint(fileName));
   Debug::print(Debug::Plantuml,0,"*** %s outDir: %s\n","writePlantUMLSource",qPrint(outDir));
 
@@ -85,10 +84,6 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
     uint pos = qcOutDir.findRev("/");
     QCString generateType(qcOutDir.right(qcOutDir.length() - (pos + 1)) );
     Debug::print(Debug::Plantuml,0,"*** %s generateType: %s\n","writePlantUMLSource",qPrint(generateType));
-    //QCString qcBaseName(baseName);
-    //pos = qcBaseName.findRev("/");
-    //QCString baseFileName(qcBaseName.right(qcBaseName.length() - (pos + 1)) );
-    //Debug::print(Debug::Plantuml,0,"*** %s baseFileName: %s\n","writePlantUMLSource",qPrint(baseFileName));
     PlantumlManager::instance()->insert(generateType,puName,format,text);
   } 
 
@@ -168,17 +163,7 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp
   int exitCode;
   msg("Running PlantUML on generated file %s.pu\n",baseName);
   portable_sysTimerStart();
-  if(Config_getBool(PLANTUML_RUN_JAVA_ONCE)){
-    QCString qcOutDir(outDir);
-    uint pos = qcOutDir.findRev("/");
-    QCString generateType(qcOutDir.right(qcOutDir.length() - (pos + 1)) );
-    Debug::print(Debug::Plantuml,0,"*** %s generateType: %s\n","generatePlantUMLOutput",qPrint(generateType));
-    QCString qcBaseName(baseName);
-    pos = qcBaseName.findRev("/");
-    QCString baseFileName(qcBaseName.right(qcBaseName.length() - (pos + 1)) );
-    Debug::print(Debug::Plantuml,0,"*** %s baseFileName: %s\n","generatePlantUMLOutput",qPrint(baseFileName));
-    //PlantumlManager::instance()->insert(generateType,baseFileName,format);
-  } else {  // ! Config_getBool(PLANTUML_RUN_JAVA_ONCE)
+  if(!Config_getBool(PLANTUML_RUN_JAVA_ONCE)){    // ! Config_getBool(PLANTUML_RUN_JAVA_ONCE)
     Debug::print(Debug::Plantuml,0,"*** running: %s %s outDir:%s %s\n",qPrint(pumlExe),qPrint(pumlArgs),outDir,baseName);
     if ((exitCode=portable_system(pumlExe,pumlArgs,TRUE))!=0)
     {
@@ -256,100 +241,6 @@ PlantumlManager::~PlantumlManager()
   }
 }
 
-void PlantumlManager::runPlantumlFiles(QDict< QList <QCString> > &PlantumlFiles,const char *type)
-{
-  /* example : running: java -Djava.awt.headless=true -jar "/Users/cheoljoo/code/common_telltale/GP/Apps/Src/MgrTelltale/tools/plantuml.jar" -o "/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html" -tpng "/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html/A.pu" -charset UTF-8  outDir:/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html /Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html/A
-   */
-  int exitCode;
-  QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
-  QCString plantumlConfigFile = Config_getString(PLANTUML_CFG_FILE);
-  QCString dotPath = Config_getString(DOT_PATH);
-
-  QCString pumlExe = "java";
-  QCString pumlArgs = "";
-
-  QStrList &pumlIncludePathList = Config_getList(PLANTUML_INCLUDE_PATH);
-  char *s=pumlIncludePathList.first();
-  if (s)
-  {
-    pumlArgs += "-Dplantuml.include.path=\"";
-    pumlArgs += s;
-    s = pumlIncludePathList.next(); 
-  }
-  while (s)
-  {
-    pumlArgs += portable_pathListSeparator();
-    pumlArgs += s;
-    s = pumlIncludePathList.next(); 
-  }
-  if (pumlIncludePathList.first()) pumlArgs += "\" ";
-  pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" ";
-  if (!plantumlConfigFile.isEmpty())
-  {
-    pumlArgs += "-config \"";
-    pumlArgs += plantumlConfigFile;
-    pumlArgs += "\" ";
-  }
-  if (Config_getBool(HAVE_DOT) && !dotPath.isEmpty())
-  {
-    pumlArgs += "-graphvizdot \"";
-    pumlArgs += dotPath;
-    pumlArgs += "dot";
-    pumlArgs += portable_commandExtension();
-    pumlArgs += "\" ";
-  }
-
-
-  QDictIterator< QList<QCString> > it( PlantumlFiles); // See QDictIterator
-  QList<QCString> *list;
-  for (it.toFirst();(list=it.current());++it)
-  {
-    QCString pumlArguments(pumlArgs);
-    msg("Running PlantUML on png PlantumlFiles in %s\n",qPrint(it.currentKey()));
-    pumlArguments+="-o \"";
-    pumlArguments+=Config_getString(OUTPUT_DIRECTORY);
-    pumlArguments+="/";
-    pumlArguments+=it.currentKey();
-    pumlArguments+="\" ";
-    pumlArguments+="-charset UTF-8 -t";
-    pumlArguments+=type;
-    pumlArguments+=" ";
-    QListIterator<QCString> li(*list);
-    QCString *nb;
-    for (li.toFirst();(nb=li.current());++li)
-    {
-      pumlArguments+="\"";
-      pumlArguments+=Config_getString(OUTPUT_DIRECTORY);
-      pumlArguments+="/";
-      pumlArguments+=it.currentKey();
-      pumlArguments+="/";
-      pumlArguments+=*nb;
-      pumlArguments+=".pu";
-      pumlArguments+="\" ";
-    }
-    Debug::print(Debug::Plantuml,0,"*** %s Running Plantuml arguments:%s\n","PlantumlManager::runPlantumlFiles",qPrint(pumlArguments));
-    if ((exitCode=portable_system(pumlExe,pumlArguments,TRUE))!=0)
-    {
-      err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
-          plantumlJarPath.data(),exitCode);
-    }
-    else if (Config_getBool(DOT_CLEANUP))
-    {
-      for (li.toFirst();(nb=li.current());++li)
-      {
-        QCString pumlName = "";
-        pumlName+=Config_getString(OUTPUT_DIRECTORY);
-        pumlName+="/";
-        pumlName+=it.currentKey();
-        pumlName+="/";
-        pumlName+=*nb;
-        pumlName+=".pu";
-        QFile(pumlName).remove();
-      }
-    }
-  }
-}
-
 void PlantumlManager::runPlantumlContent(QDict< QList <QCString> > &PlantumlFiles,QDict< QCString > &PlantumlContent, const char *type)
 {
   /* example : running: java -Djava.awt.headless=true -jar "/Users/cheoljoo/code/common_telltale/GP/Apps/Src/MgrTelltale/tools/plantuml.jar" -o "/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html" -tpng "/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html/A.pu" -charset UTF-8  outDir:/Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html /Users/cheoljoo/Code/LG/test_doxygen/DOXYGEN_OUTPUT/html/A
@@ -471,9 +362,6 @@ void PlantumlManager::runPlantumlContent(QDict< QList <QCString> > &PlantumlFile
 void PlantumlManager::run()
 {
   Debug::print(Debug::Plantuml,0,"*** %s\n","PlantumlManager::run");
-  //runPlantumlFiles(m_pngPlantumlFiles, "png");
-  //runPlantumlFiles(m_svgPlantumlFiles, "svg");
-  //runPlantumlFiles(m_epsPlantumlFiles, "eps");
   runPlantumlContent(m_pngPlantumlFiles, m_pngPlantumlContent, "png");
   runPlantumlContent(m_svgPlantumlFiles, m_svgPlantumlContent, "svg");
   runPlantumlContent(m_epsPlantumlFiles, m_epsPlantumlContent, "eps");
@@ -491,7 +379,7 @@ void PlantumlManager::print(QDict< QList <QCString> > &PlantumlFiles)
       QCString *nb;
       for (li.toFirst();(nb=li.current());++li)
       {
-        Debug::print(Debug::Plantuml,0,"*** %s PlantumlFiles         list:%s\n","PlantumlManager::print",qPrint(*nb));
+        Debug::print(Debug::Plantuml,0,"*** %s             list:%s\n","PlantumlManager::print",qPrint(*nb));
       }
     }
   }
@@ -505,7 +393,7 @@ void PlantumlManager::print(QDict<QCString> &PlantumlContent)
     for (it.toFirst();(nb=it.current());++it)
     {
       Debug::print(Debug::Plantuml,0,"*** %s PlantumlContent key:%s\n","PlantumlManager::print",qPrint(it.currentKey()));
-      Debug::print(Debug::Plantuml,0,"***      Content :%s\n",qPrint(*nb));
+      Debug::print(Debug::Plantuml,0,"*** %s                 Content :%s\n","PlantumlManager::print",qPrint(*nb));
     }
   }
 }
@@ -519,7 +407,6 @@ void PlantumlManager::addPlantumlFiles(QDict< QList <QCString> > &PlantumlFiles,
     PlantumlFiles.insert(key,list);
   }
   list->append(new QCString(value));
-  Debug::print(Debug::Plantuml,0,"*** %s append : png key:%s ,value:%s\n","PlantumlManager::addPlantumlFiles",qPrint(key),qPrint(value));
 }
 
 void PlantumlManager::addPlantumlContent(QDict< QCString > &PlantumlContent,const QCString key , const QCString &puContent)