@@ -26,7 +26,6 @@ import java.awt.event.ActionEvent
2626import java.awt.event.ActionListener
2727import java.awt.event.MouseEvent
2828import java.awt.event.MouseListener
29- import java.text.DecimalFormat
3029import java.util.ArrayList
3130import java.util.regex.Pattern
3231import javax.swing.BorderFactory
@@ -75,6 +74,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
7574 static val INDICATOR_WIDTH = 20
7675 static val OVERVIEW_TABLE_ROW_HEIGHT = 20
7776 static val TEXTPANE_DIM = new Dimension (100 , 100 )
77+ static var boolean useSmartTimes
7878 LimitedLinkedHashMap<String , Run > runs = new LimitedLinkedHashMap<String , Run > (10 )
7979 Run currentRun
8080 JPanel basePanel
@@ -338,6 +338,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
338338 fixCheckBoxMenuItem(showInfoIndicatorCheckBoxMenuItem)
339339 syncDetailTabCheckBoxMenuItem. selected = preferences. syncDetailTab
340340 fixCheckBoxMenuItem(syncDetailTabCheckBoxMenuItem)
341+ useSmartTimes = preferences. useSmartTimes
341342 }
342343
343344 def setModel (Run run ) {
@@ -349,7 +350,13 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
349350 private def setCurrentRun (Run run ) {
350351 if (run !== currentRun) {
351352 currentRun = run
352- testOverviewTableModel. setModel(run. tests, showTestDescriptionCheckBoxMenuItem. selected)
353+ testOverviewTableModel. setModel(run. tests, showTestDescriptionCheckBoxMenuItem. selected, useSmartTimes)
354+ val header = testOverviewTableModel. timeColumnName
355+ val timeColumn = testOverviewTable. columnModel. getColumn(4 )
356+ if (timeColumn. headerValue != header) {
357+ timeColumn. headerValue = header
358+ testOverviewTable. tableHeader. repaint
359+ }
353360 resetDerived
354361 val item = new ComboBoxItem<String , String > (currentRun. reporterId, currentRun. name)
355362 runComboBox. selectedItem = item
@@ -640,12 +647,10 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
640647 }
641648
642649 static class TimeFormatRenderer extends DefaultTableCellRenderer {
643- static val DecimalFormat formatter = new DecimalFormat (" #,##0.000" )
644-
645650 override getTableCellRendererComponent (JTable table , Object val ue , boolean isSelected , boolean hasFocus ,
646651 int row , int col ) {
647- val renderedValue = if (value == = null ) { null } else {formatter . format(value as Number )}
648- return super . getTableCellRendererComponent(table, renderedValue , isSelected, hasFocus, row, col)
652+ val smartTime = new SmartTime (value as Double , useSmartTimes)
653+ return super . getTableCellRendererComponent(table, smartTime . toString , isSelected, hasFocus, row, col)
649654 }
650655 }
651656
0 commit comments