show time header with or without unit based on useSmartTime preference

PhilippSalvisberg · PhilippSalvisberg · commit 1ec4ae1c2065 · 2019-07-27T23:46:54.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.xtend b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.xtend
@@ -27,6 +27,7 @@ class TestOverviewTableModel extends DefaultTableModel {
 	String commonPrefix
 	boolean commonPrefixCalculated
 	boolean showDescription
+	boolean useSmartTimes
 	
 	new() {
 		super()
@@ -40,10 +41,11 @@ class TestOverviewTableModel extends DefaultTableModel {
 		}
 	}
 	
-	def setModel(LinkedHashMap<String, Test> tests, boolean showDescription) {
+	def setModel(LinkedHashMap<String, Test> tests, boolean showDescription, boolean useSmartTimes) {
 		commonPrefixCalculated = false
 		this.tests = tests
 		this.showDescription = showDescription
+		this.useSmartTimes = useSmartTimes
 		calcCommonPrefix
 		fireTableDataChanged()
 	}
@@ -70,6 +72,11 @@ class TestOverviewTableModel extends DefaultTableModel {
 		}
 	}
 	
+	def getTimeColumnName() {
+		val timeColumnName = '''«UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME_COLUMN")»«IF !useSmartTimes» [s]«ENDIF»'''
+		return timeColumnName		
+	}
+	
 	def getTest(int row) {
 		val entry = tests.entrySet.get(row)
 		val test = tests.get(entry.key)
@@ -120,7 +127,7 @@ class TestOverviewTableModel extends DefaultTableModel {
 
 	override getColumnName(int col) {
 		return #["", "", "", UtplsqlResources.getString(if (showDescription) {"RUNNER_DESCRIPTION_LABEL"} else {"RUNNER_TEST_ID_COLUMN"}),
-			UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME_COLUMN")].get(col)
+			timeColumnName].get(col)
 	}
 
 	override isCellEditable(int row, int column) {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ class TestOverviewTableModel extends DefaultTableModel {`
`27`	`27`	`String commonPrefix`
`28`	`28`	`boolean commonPrefixCalculated`
`29`	`29`	`boolean showDescription`
	`30`	`+ boolean useSmartTimes`
`30`	`31`
`31`	`32`	`new() {`
`32`	`33`	`super()`
`@@ -40,10 +41,11 @@ class TestOverviewTableModel extends DefaultTableModel {`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`43`		`- def setModel(LinkedHashMap<String, Test> tests, boolean showDescription) {`
	`44`	`+ def setModel(LinkedHashMap<String, Test> tests, boolean showDescription, boolean useSmartTimes) {`
`44`	`45`	`commonPrefixCalculated = false`
`45`	`46`	`this.tests = tests`
`46`	`47`	`this.showDescription = showDescription`
	`48`	`+ this.useSmartTimes = useSmartTimes`
`47`	`49`	`calcCommonPrefix`
`48`	`50`	`fireTableDataChanged()`
`49`	`51`	`}`
`@@ -70,6 +72,11 @@ class TestOverviewTableModel extends DefaultTableModel {`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`
	`75`	`+ def getTimeColumnName() {`
	`76`	`+ val timeColumnName = '''«UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME_COLUMN")»«IF !useSmartTimes» [s]«ENDIF»'''`
	`77`	`+ return timeColumnName`
	`78`	`+ }`
	`79`	`+`
`73`	`80`	`def getTest(int row) {`
`74`	`81`	`val entry = tests.entrySet.get(row)`
`75`	`82`	`val test = tests.get(entry.key)`
`@@ -120,7 +127,7 @@ class TestOverviewTableModel extends DefaultTableModel {`
`120`	`127`
`121`	`128`	`override getColumnName(int col) {`
`122`	`129`	`return #["", "", "", UtplsqlResources.getString(if (showDescription) {"RUNNER_DESCRIPTION_LABEL"} else {"RUNNER_TEST_ID_COLUMN"}),`
`123`		`- UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME_COLUMN")].get(col)`
	`130`	`+ timeColumnName].get(col)`
`124`	`131`	`}`
`125`	`132`
`126`	`133`	`override isCellEditable(int row, int column) {`