Merge pull request #4132 from rstudio/bugfix/job-name-vs-script-name-…

…pro-merge companion to rstudio/rstudio-pro#804
rstudio · Jan 9, 2019 · b19c757 · b19c757
2 parents cc8f482 + 882aac5
commit b19c757
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/jobs/view/JobLauncherDialog.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/jobs/view/JobLauncherDialog.java
@@ -71,14 +71,7 @@ protected JobLaunchSpec collectInput()
       String jobName;
       if (source_ == JobSource.Selection)
       {
-         if (StringUtil.isNullOrEmpty(controls_.scriptPath()))
-         {
-            jobName = "Current selection";
-         }
-         else
-         {
-            jobName = FileSystemItem.getNameFromPath(controls_.scriptPath()) + " selection";
-         }
+         jobName = computeSelectionJobName(controls_.scriptPath());
       }
       else 
       {
@@ -118,6 +111,18 @@ protected Widget createMainWidget()
       return controls_;
    }
 
+   public static String computeSelectionJobName(String path)
+   {
+      if (StringUtil.isNullOrEmpty(path))
+      {
+         return "Current selection";
+      }
+      else
+      {
+         return FileSystemItem.getNameFromPath(path) + " selection";
+      }
+   }
+
    private final String code_;
    private final JobSource source_;
    private JobLauncherControls controls_;