diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-11-24 08:40:18 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-11-24 08:40:18 +0100 |
commit | d49484d1eff71bdfbb6581d17f737c0b5ff4278f (patch) | |
tree | 9827408c19caa2170acf36ca0d093127005d018f /src/scaladoc | |
parent | 9ed51f21fa73011c8f60e224e8228035330dcfa0 (diff) | |
parent | 35dd1a9a07aa5e993212cef5fd401f5534a4725a (diff) | |
download | scala-d49484d1eff71bdfbb6581d17f737c0b5ff4278f.tar.gz scala-d49484d1eff71bdfbb6581d17f737c0b5ff4278f.tar.bz2 scala-d49484d1eff71bdfbb6581d17f737c0b5ff4278f.zip |
Merge pull request #4860 from janekdb/2.11.x-scaladoc-fix-one-off-dot-restart-note
Align DotRunner dot restart count with command option description
Diffstat (limited to 'src/scaladoc')
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala index 9381cf3a35..9287bfbc2b 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/diagram/DotRunner.scala @@ -18,16 +18,16 @@ import model._ /** This class takes care of running the graphviz dot utility */ class DotRunner(settings: doc.Settings) { - private[this] var dotRestarts = 0 + private[this] var dotAttempts = 0 private[this] var dotProcess: DotProcess = null def feedToDot(dotInput: String, template: DocTemplateEntity): String = { if (dotProcess == null) { - if (dotRestarts < settings.docDiagramsDotRestart.value) { - if (dotRestarts != 0) + if (dotAttempts < settings.docDiagramsDotRestart.value + 1) { + if (dotAttempts > 0) settings.printMsg("Graphviz will be restarted...\n") - dotRestarts += 1 + dotAttempts += 1 dotProcess = new DotProcess(settings) } else return null @@ -41,7 +41,7 @@ class DotRunner(settings: doc.Settings) { if (result == null) { dotProcess.cleanup() dotProcess = null - if (dotRestarts == settings.docDiagramsDotRestart.value) { + if (dotAttempts == 1 + settings.docDiagramsDotRestart.value) { settings.printMsg("\n") settings.printMsg("**********************************************************************") settings.printMsg("Diagrams will be disabled for this run because the graphviz dot tool") |