Console progress output on the same line

windup · Apr 7, 2017 · fe95b0f · fe95b0f
1 parent 409ad90
commit fe95b0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/bootstrap/src/main/java/org/jboss/windup/bootstrap/ConsoleProgressMonitor.java b/bootstrap/src/main/java/org/jboss/windup/bootstrap/ConsoleProgressMonitor.java
@@ -56,7 +56,14 @@ public void setTaskName(String name)
     public void subTask(String subTask)
     {
         String message = String.format("[%d/%d] %s", currentWork, totalWork, subTask);
-        System.out.println(message);
+        if (subTask.endsWith("\r"))
+        {
+            System.out.print(message);
+        } 
+        else 
+        {
+            System.out.println("\r" + message);
+        }
         LOG.info(message);
     }
 

diff --git a/exec/impl/src/main/java/org/jboss/windup/exec/DefaultRuleLifecycleListener.java b/exec/impl/src/main/java/org/jboss/windup/exec/DefaultRuleLifecycleListener.java
@@ -67,8 +67,12 @@ public boolean ruleEvaluationProgress(GraphRewrite event, String name, int curre
         // don't redisplay it if nothing has changed
         if (!newProgressMessage.equals(lastRuleProgressMessage))
         {
+            if (lastRuleProgressMessage != null && lastRuleProgressMessage.length() > newProgressMessage.length())
+            {
+                newProgressMessage = String.format("%1$-" + lastRuleProgressMessage.length() + "s", newProgressMessage);
+            }
             lastRuleProgressMessage = newProgressMessage;
-            progressMonitor.subTask(newProgressMessage);
+            progressMonitor.subTask(newProgressMessage + "\r");
         }
         return progressMonitor.isCancelled();
     }