Skip to content

Commit e8fd49e

Browse files
committed
align metrics tab in pipeline, fixes #5026
fix formatting
1 parent f24ba06 commit e8fd49e

File tree

2 files changed

+38
-20
lines changed

2 files changed

+38
-20
lines changed

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

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -135,35 +135,30 @@ public void addPipelineGrid() {
135135

136136
addToolBar();
137137

138-
// ignore whitespace for transformName column valueMeta, causing sorting to ignore whitespace
139-
String transformNameColumnName =
140-
BaseMessages.getString(PKG, "PipelineLog.Column.TransformName");
141-
IValueMeta valueMeta = new ValueMetaString(transformNameColumnName);
142-
valueMeta.setIgnoreWhitespace(true);
143-
ColumnInfo transformNameColumnInfo =
144-
new ColumnInfo(transformNameColumnName, ColumnInfo.COLUMN_TYPE_TEXT, false, true);
145-
transformNameColumnInfo.setValueMeta(valueMeta);
146-
147138
ColumnInfo[] columns =
148139
new ColumnInfo[] {
149-
transformNameColumnInfo,
140+
new ColumnInfo(
141+
BaseMessages.getString(PKG, "PipelineLog.Column.TransformName"),
142+
ColumnInfo.COLUMN_TYPE_TEXT,
143+
false,
144+
true),
150145
new ColumnInfo(
151146
BaseMessages.getString(PKG, "PipelineLog.Column.Copynr"),
152147
ColumnInfo.COLUMN_TYPE_TEXT,
153148
false,
154149
true),
155150
new ColumnInfo(
156-
BaseMessages.getString(PKG, "PipelineLog.Column.Read"),
151+
BaseMessages.getString(PKG, "PipelineLog.Column.Input"),
157152
ColumnInfo.COLUMN_TYPE_TEXT,
158153
false,
159154
true),
160155
new ColumnInfo(
161-
BaseMessages.getString(PKG, "PipelineLog.Column.Written"),
156+
BaseMessages.getString(PKG, "PipelineLog.Column.Read"),
162157
ColumnInfo.COLUMN_TYPE_TEXT,
163158
false,
164159
true),
165160
new ColumnInfo(
166-
BaseMessages.getString(PKG, "PipelineLog.Column.Input"),
161+
BaseMessages.getString(PKG, "PipelineLog.Column.Written"),
167162
ColumnInfo.COLUMN_TYPE_TEXT,
168163
false,
169164
true),
@@ -188,12 +183,17 @@ public void addPipelineGrid() {
188183
false,
189184
true),
190185
new ColumnInfo(
191-
BaseMessages.getString(PKG, "PipelineLog.Column.Active"),
186+
BaseMessages.getString(PKG, "PipelineLog.Column.BuffersInput"),
187+
ColumnInfo.COLUMN_TYPE_TEXT,
188+
false,
189+
true),
190+
new ColumnInfo(
191+
BaseMessages.getString(PKG, "PipelineLog.Column.BuffersOutput"),
192192
ColumnInfo.COLUMN_TYPE_TEXT,
193193
false,
194194
true),
195195
new ColumnInfo(
196-
BaseMessages.getString(PKG, "PipelineLog.Column.Time"),
196+
BaseMessages.getString(PKG, "PipelineLog.Column.Duration"),
197197
ColumnInfo.COLUMN_TYPE_TEXT,
198198
false,
199199
true),
@@ -203,7 +203,7 @@ public void addPipelineGrid() {
203203
false,
204204
true),
205205
new ColumnInfo(
206-
BaseMessages.getString(PKG, "PipelineLog.Column.PriorityBufferSizes"),
206+
BaseMessages.getString(PKG, "PipelineLog.Column.Status"),
207207
ColumnInfo.COLUMN_TYPE_TEXT,
208208
false,
209209
true),
@@ -221,6 +221,7 @@ public void addPipelineGrid() {
221221
columns[10].setAlignment(SWT.RIGHT);
222222
columns[11].setAlignment(SWT.RIGHT);
223223
columns[12].setAlignment(SWT.RIGHT);
224+
columns[13].setAlignment(SWT.RIGHT);
224225

225226
pipelineGridView =
226227
new TableView(
@@ -410,7 +411,11 @@ private void refreshView() {
410411
// Duration?
411412
//
412413
ColumnInfo durationColumn =
413-
new ColumnInfo("Duration", ColumnInfo.COLUMN_TYPE_TEXT, false, true); // TODO i18n
414+
new ColumnInfo(
415+
BaseMessages.getString(PKG, "PipelineLog.Column.Duration"),
416+
ColumnInfo.COLUMN_TYPE_TEXT,
417+
false,
418+
true);
414419
durationColumn.setValueMeta(stringMeta);
415420
durationColumn.setAlignment(SWT.RIGHT);
416421
columns.add(durationColumn);
@@ -421,12 +426,21 @@ private void refreshView() {
421426
speedMeta.setConversionMask(" ###,###,###,##0");
422427
stringMeta.setConversionMetadata(speedMeta);
423428
ColumnInfo speedColumn =
424-
new ColumnInfo("Speed", ColumnInfo.COLUMN_TYPE_TEXT, false, true); // TODO i18n
429+
new ColumnInfo(
430+
BaseMessages.getString(PKG, "PipelineLog.Column.Speed"),
431+
ColumnInfo.COLUMN_TYPE_TEXT,
432+
false,
433+
true);
425434
speedColumn.setValueMeta(stringMeta);
426435
speedColumn.setAlignment(SWT.RIGHT);
427436
columns.add(speedColumn);
428437

429-
columns.add(new ColumnInfo("Status", ColumnInfo.COLUMN_TYPE_TEXT, false, true)); // TODO i18n
438+
columns.add(
439+
new ColumnInfo(
440+
BaseMessages.getString(PKG, "PipelineLog.Column.Status"),
441+
ColumnInfo.COLUMN_TYPE_TEXT,
442+
false,
443+
true));
430444

431445
// The data in the grid...
432446
//

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,18 @@ PipelineLog.Button.ShowErrorLines=\ &Show error lines
217217
PipelineLog.Button.ShowOnlyActiveTransforms=Hide inactive
218218
PipelineLog.Button.ShowOnlySelectedTransforms=Show only selected transforms
219219
PipelineLog.Column.Active=Active
220+
PipelineLog.Column.BuffersInput=Buffers Input
221+
PipelineLog.Column.BuffersOutput=Buffers Output
220222
PipelineLog.Column.Copynr=Copy
223+
PipelineLog.Column.Duration=Duration
221224
PipelineLog.Column.Errors=Errors
222225
PipelineLog.Column.Input=Input
223226
PipelineLog.Column.Output=Output
227+
PipelineLog.Column.Status=Status
224228
PipelineLog.Column.PriorityBufferSizes=input/output
225229
PipelineLog.Column.Read=Read
226230
PipelineLog.Column.Rejected=Rejected
227-
PipelineLog.Column.Speed=Speed (r/s)
231+
PipelineLog.Column.Speed=Speed
228232
PipelineLog.Column.Time=Time
229233
PipelineLog.Column.TransformName=Transform Name
230234
PipelineLog.Column.Updated=Updated

0 commit comments

Comments
 (0)