From d5fdabb678f4df7c101d8660cb7c37086e35489a Mon Sep 17 00:00:00 2001
From: Sandor Murakozi <smurakozi@gmail.com>
Date: Fri, 19 Jan 2018 20:46:40 +0100
Subject: [PATCH] Minor changes requested by reviewer

---
 .../scala/org/apache/spark/ui/jobs/AllJobsPage.scala     | 6 +++---
 .../main/scala/org/apache/spark/ui/jobs/JobPage.scala    | 6 +++---
 .../main/scala/org/apache/spark/ui/jobs/StagePage.scala  | 9 +++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
index 6da5396163c5c..8d9ec2846525c 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
@@ -70,10 +70,10 @@ private[ui] class AllJobsPage(parent: JobsTab, store: AppStatusStore) extends We
       val status = job.status
       val (_, lastStageDescription) = lastStageNameAndDescription(store, job)
       val displayJobDescription =
-        if (lastStageDescription.isEmpty) {
-          job.name
-        } else {
+        if (lastStageDescription.nonEmpty) {
           UIUtils.makeDescription(lastStageDescription, "", plainText = true).text
+        } else {
+          job.name
         }
       val submissionTime = job.submissionTime.get.getTime()
       val completionTime = job.completionTime.map(_.getTime()).getOrElse(System.currentTimeMillis())
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
index 31b5bf744546e..974e5c5ffd0a0 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
@@ -339,9 +339,9 @@ private[ui] class JobPage(parent: JobsTab, store: AppStatusStore) extends WebUIP
     val operationGraphContent = store.asOption(store.operationGraphForJob(jobId)) match {
       case Some(operationGraph) => UIUtils.showDagVizForJob(jobId, operationGraph)
       case None =>
-              <div id="no-info">
-                <p>No DAG visualization information to display for job {jobId}</p>
-              </div>
+        <div id="no-info">
+          <p>No DAG visualization information to display for job {jobId}</p>
+        </div>
     }
     content ++= operationGraphContent
 
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index fee872efb48f4..d1aacf6e49295 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -18,20 +18,17 @@
 package org.apache.spark.ui.jobs
 
 import java.net.URLEncoder
-import java.util.{Collections, Date}
+import java.util.Date
 import java.util.concurrent.TimeUnit
 import javax.servlet.http.HttpServletRequest
 
 import scala.collection.mutable.{HashMap, HashSet}
-import scala.xml.{Elem, Node, Unparsed}
+import scala.xml.{Node, Unparsed}
 
 import org.apache.commons.lang3.StringEscapeUtils
 
-import org.apache.spark.SparkConf
-import org.apache.spark.internal.config._
 import org.apache.spark.scheduler.TaskLocality
 import org.apache.spark.status._
-import org.apache.spark.status.api.v1
 import org.apache.spark.status.api.v1._
 import org.apache.spark.ui._
 import org.apache.spark.util.Utils
@@ -1003,7 +1000,7 @@ private object ApiHelper {
     }
   }
 
-  def lastStageNameAndDescription(store: AppStatusStore, job: v1.JobData): (String, String) = {
+  def lastStageNameAndDescription(store: AppStatusStore, job: JobData): (String, String) = {
     store.asOption(store.lastStageAttempt(job.stageIds.max)) match {
       case Some(lastStageAttempt) =>
         (lastStageAttempt.name, lastStageAttempt.description.getOrElse(""))