Merge pull request #5027 from hansva/5026

align metrics tab in pipeline, fixes #5026

Author: hansva

ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java

@@ -135,35 +135,30 @@ public void addPipelineGrid() {
 
     addToolBar();
 
-    // ignore whitespace for transformName column valueMeta, causing sorting to ignore whitespace
-    String transformNameColumnName =
-        BaseMessages.getString(PKG, "PipelineLog.Column.TransformName");
-    IValueMeta valueMeta = new ValueMetaString(transformNameColumnName);
-    valueMeta.setIgnoreWhitespace(true);
-    ColumnInfo transformNameColumnInfo =
-        new ColumnInfo(transformNameColumnName, ColumnInfo.COLUMN_TYPE_TEXT, false, true);
-    transformNameColumnInfo.setValueMeta(valueMeta);
-
     ColumnInfo[] columns =
         new ColumnInfo[] {
-          transformNameColumnInfo,
+          new ColumnInfo(
+              BaseMessages.getString(PKG, "PipelineLog.Column.TransformName"),
+              ColumnInfo.COLUMN_TYPE_TEXT,
+              false,
+              true),
           new ColumnInfo(
               BaseMessages.getString(PKG, "PipelineLog.Column.Copynr"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
           new ColumnInfo(
-              BaseMessages.getString(PKG, "PipelineLog.Column.Read"),
+              BaseMessages.getString(PKG, "PipelineLog.Column.Input"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
           new ColumnInfo(
-              BaseMessages.getString(PKG, "PipelineLog.Column.Written"),
+              BaseMessages.getString(PKG, "PipelineLog.Column.Read"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
           new ColumnInfo(
-              BaseMessages.getString(PKG, "PipelineLog.Column.Input"),
+              BaseMessages.getString(PKG, "PipelineLog.Column.Written"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
@@ -188,12 +183,17 @@ public void addPipelineGrid() {
               false,
               true),
           new ColumnInfo(
-              BaseMessages.getString(PKG, "PipelineLog.Column.Active"),
+              BaseMessages.getString(PKG, "PipelineLog.Column.BuffersInput"),
+              ColumnInfo.COLUMN_TYPE_TEXT,
+              false,
+              true),
+          new ColumnInfo(
+              BaseMessages.getString(PKG, "PipelineLog.Column.BuffersOutput"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
           new ColumnInfo(
-              BaseMessages.getString(PKG, "PipelineLog.Column.Time"),
+              BaseMessages.getString(PKG, "PipelineLog.Column.Duration"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
@@ -203,7 +203,7 @@ public void addPipelineGrid() {
               false,
               true),
           new ColumnInfo(
-              BaseMessages.getString(PKG, "PipelineLog.Column.PriorityBufferSizes"),
+              BaseMessages.getString(PKG, "PipelineLog.Column.Status"),
               ColumnInfo.COLUMN_TYPE_TEXT,
               false,
               true),
@@ -221,6 +221,7 @@ public void addPipelineGrid() {
     columns[10].setAlignment(SWT.RIGHT);
     columns[11].setAlignment(SWT.RIGHT);
     columns[12].setAlignment(SWT.RIGHT);
+    columns[13].setAlignment(SWT.RIGHT);
 
     pipelineGridView =
         new TableView(
@@ -410,7 +411,11 @@ private void refreshView() {
       // Duration?
       //
       ColumnInfo durationColumn =
-          new ColumnInfo("Duration", ColumnInfo.COLUMN_TYPE_TEXT, false, true); // TODO i18n
+          new ColumnInfo(
+              BaseMessages.getString(PKG, "PipelineLog.Column.Duration"),
+              ColumnInfo.COLUMN_TYPE_TEXT,
+              false,
+              true);
       durationColumn.setValueMeta(stringMeta);
       durationColumn.setAlignment(SWT.RIGHT);
       columns.add(durationColumn);
@@ -421,12 +426,21 @@ private void refreshView() {
       speedMeta.setConversionMask(" ###,###,###,##0");
       stringMeta.setConversionMetadata(speedMeta);
       ColumnInfo speedColumn =
-          new ColumnInfo("Speed", ColumnInfo.COLUMN_TYPE_TEXT, false, true); // TODO i18n
+          new ColumnInfo(
+              BaseMessages.getString(PKG, "PipelineLog.Column.Speed"),
+              ColumnInfo.COLUMN_TYPE_TEXT,
+              false,
+              true);
       speedColumn.setValueMeta(stringMeta);
       speedColumn.setAlignment(SWT.RIGHT);
       columns.add(speedColumn);
 
-      columns.add(new ColumnInfo("Status", ColumnInfo.COLUMN_TYPE_TEXT, false, true)); // TODO i18n
+      columns.add(
+          new ColumnInfo(
+              BaseMessages.getString(PKG, "PipelineLog.Column.Status"),
+              ColumnInfo.COLUMN_TYPE_TEXT,
+              false,
+              true));
 
       // The data in the grid...
       //

ui/src/main/resources/org/apache/hop/ui/hopgui/messages/messages_en_US.properties

@@ -217,14 +217,18 @@ PipelineLog.Button.ShowErrorLines=\ &Show error lines
 PipelineLog.Button.ShowOnlyActiveTransforms=Hide inactive
 PipelineLog.Button.ShowOnlySelectedTransforms=Show only selected transforms
 PipelineLog.Column.Active=Active
+PipelineLog.Column.BuffersInput=Buffers Input
+PipelineLog.Column.BuffersOutput=Buffers Output
 PipelineLog.Column.Copynr=Copy
+PipelineLog.Column.Duration=Duration
 PipelineLog.Column.Errors=Errors
 PipelineLog.Column.Input=Input
 PipelineLog.Column.Output=Output
+PipelineLog.Column.Status=Status
 PipelineLog.Column.PriorityBufferSizes=input/output
 PipelineLog.Column.Read=Read
 PipelineLog.Column.Rejected=Rejected
-PipelineLog.Column.Speed=Speed (r/s)
+PipelineLog.Column.Speed=Speed
 PipelineLog.Column.Time=Time
 PipelineLog.Column.TransformName=Transform Name
 PipelineLog.Column.Updated=Updated