Skip to content

Commit 9d92cd0

Browse files
add warning and info indicators
1 parent efd96bf commit 9d92cd0

File tree

3 files changed

+66
-12
lines changed

3 files changed

+66
-12
lines changed

sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.xtend

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,22 @@ class Test extends Item {
4747
}
4848
return icon
4949
}
50+
51+
def getWarningIcon() {
52+
var Icon icon = null
53+
if (counter !== null) {
54+
if (counter.warning > 0) {
55+
icon = UtplsqlResources.getIcon("WARNING_ICON")
56+
}
57+
}
58+
return icon
59+
}
60+
61+
def getInfoIcon() {
62+
var Icon icon = null
63+
if (serverOutput !== null && serverOutput.length > 0) {
64+
icon = UtplsqlResources.getIcon("INFO_ICON")
65+
}
66+
return icon
67+
}
5068
}

sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class RunnerPanel implements FocusListener {
103103
val run = runs.get(reporterId)
104104
val row = run.totalNumberOfCompletedTests - 1
105105
val header = testOverviewTableModel.testIdColumnName
106-
val idColumn = testOverviewTable.columnModel.getColumn(1)
106+
val idColumn = testOverviewTable.columnModel.getColumn(3)
107107
if (idColumn.headerValue != header) {
108108
idColumn.headerValue = header
109109
testOverviewTable.tableHeader.repaint
@@ -235,7 +235,20 @@ class RunnerPanel implements FocusListener {
235235
int row, int col) {
236236
val renderer = table.getTableHeader().getDefaultRenderer()
237237
val label = renderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, col) as JLabel
238-
label.horizontalAlignment = if (col === 2) {JLabel.RIGHT} else {JLabel.LEFT}
238+
if (col === 0) {
239+
label.icon = UtplsqlResources.getIcon("UTPLSQL_ICON")
240+
label.horizontalAlignment = JLabel.CENTER
241+
} else if (col === 1) {
242+
label.icon = UtplsqlResources.getIcon("WARNING_ICON")
243+
label.horizontalAlignment = JLabel.CENTER
244+
} else if (col === 2) {
245+
label.icon = UtplsqlResources.getIcon("INFO_ICON")
246+
label.horizontalAlignment = JLabel.CENTER
247+
} else if (col === 3) {
248+
label.horizontalAlignment = JLabel.LEFT
249+
} else if (col === 4) {
250+
label.horizontalAlignment = JLabel.RIGHT
251+
}
239252
return label
240253
}
241254
}
@@ -362,13 +375,24 @@ class RunnerPanel implements FocusListener {
362375
testOverviewTable.autoCreateRowSorter = true
363376
testOverviewTable.selectionModel.addListSelectionListener(new TestOverviewRowListener(this))
364377
val testTableHeaderRenderer = new TestTableHeaderRenderer
365-
val overviewTableIcon = testOverviewTable.columnModel.getColumn(0)
366-
overviewTableIcon.minWidth = 20
367-
overviewTableIcon.preferredWidth = 20
368-
overviewTableIcon.maxWidth = 20
369-
val overviewTableId = testOverviewTable.columnModel.getColumn(1)
378+
val overviewTableStatus = testOverviewTable.columnModel.getColumn(0)
379+
overviewTableStatus.minWidth = 20
380+
overviewTableStatus.preferredWidth = 20
381+
overviewTableStatus.maxWidth = 20
382+
overviewTableStatus.headerRenderer = testTableHeaderRenderer
383+
val overviewTableWarning = testOverviewTable.columnModel.getColumn(1)
384+
overviewTableWarning.minWidth = 20
385+
overviewTableWarning.preferredWidth = 20
386+
overviewTableWarning.maxWidth = 20
387+
overviewTableWarning.headerRenderer = testTableHeaderRenderer
388+
val overviewTableInfo = testOverviewTable.columnModel.getColumn(2)
389+
overviewTableInfo.minWidth = 20
390+
overviewTableInfo.preferredWidth = 20
391+
overviewTableInfo.maxWidth = 20
392+
overviewTableInfo.headerRenderer = testTableHeaderRenderer
393+
val overviewTableId = testOverviewTable.columnModel.getColumn(3)
370394
overviewTableId.headerRenderer = testTableHeaderRenderer
371-
val overviewTableTime = testOverviewTable.columnModel.getColumn(2)
395+
val overviewTableTime = testOverviewTable.columnModel.getColumn(4)
372396
overviewTableTime.preferredWidth = 60
373397
overviewTableTime.maxWidth = 100
374398
overviewTableTime.headerRenderer = testTableHeaderRenderer

sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.xtend

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class TestOverviewTableModel extends DefaultTableModel {
5858
}
5959

6060
override getColumnCount() {
61-
return 3
61+
return 5
6262
}
6363

6464
override getValueAt(int row, int col) {
@@ -74,9 +74,15 @@ class TestOverviewTableModel extends DefaultTableModel {
7474
return test.statusIcon
7575
}
7676
case 1: {
77-
return test.id.substring(if(commonPrefix === null) {0} else {commonPrefix.length})
77+
return test.warningIcon
7878
}
7979
case 2: {
80+
return test.infoIcon
81+
}
82+
case 3: {
83+
return test.id.substring(if(commonPrefix === null) {0} else {commonPrefix.length})
84+
}
85+
case 4: {
8086
return test.executionTime
8187
}
8288
default: {
@@ -86,7 +92,7 @@ class TestOverviewTableModel extends DefaultTableModel {
8692
}
8793

8894
override getColumnName(int col) {
89-
return #[UtplsqlResources.getString("RUNNER_TEST_STATUS"), UtplsqlResources.getString("RUNNER_TEST_ID"),
95+
return #["", "", "", UtplsqlResources.getString("RUNNER_TEST_ID"),
9096
UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME")].get(col)
9197
}
9298

@@ -100,9 +106,15 @@ class TestOverviewTableModel extends DefaultTableModel {
100106
return Icon
101107
}
102108
case 1: {
103-
return String
109+
return Icon
104110
}
105111
case 2: {
112+
return Icon
113+
}
114+
case 3: {
115+
return String
116+
}
117+
case 4: {
106118
return Double
107119
}
108120
default: {

0 commit comments

Comments
 (0)