apply preferences for showNumberOfRunsInHistory and showTestDescription

Author: PhilippSalvisberg

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

@@ -98,6 +98,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 	JTable testOverviewTable
 	JMenuItem testOverviewRunMenuItem
 	JMenuItem testOverviewRunWorksheetMenuItem
+	JCheckBoxMenuItem showTestDescriptionCheckBoxMenuItem
 	JCheckBoxMenuItem showWarningIndicatorCheckBoxMenuItem
 	JCheckBoxMenuItem showInfoIndicatorCheckBoxMenuItem
 	JCheckBoxMenuItem syncDetailTabCheckBoxMenuItem
@@ -157,6 +158,16 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 		}
 	}
 
+	private def applyShowNumberOfRunsInHistory(int maxRuns) {
+		if (maxRuns != runs.maxEntries) {
+			val newRuns = new LimitedLinkedHashMap<String, Run>(maxRuns)
+			for (entry : runs.entrySet) {
+				newRuns.put(entry.key, entry.value)
+			}
+			runs = newRuns
+		}
+	}
+
 	private def applyShowDisabledCounter(boolean show) {
 		disabledCounterValueLabel.parent.visible = showDisabledCounterCheckBoxMenuItem.selected
 	}
@@ -168,6 +179,13 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 	private def applyShowInfoCounter(boolean show) {
 		infoCounterValueLabel.parent.visible = showInfoCounterCheckBoxMenuItem.selected
 	}
+	
+	private def applyShowTestDescription(boolean show) {
+		testOverviewTableModel.updateModel(showTestDescriptionCheckBoxMenuItem.selected)
+		val idColumn = testOverviewTable.columnModel.getColumn(3)
+		idColumn.headerValue = testOverviewTableModel.testIdColumnName
+		testOverviewTable.tableHeader.repaint
+	}
 
 	private def applyShowWarningIndicator(boolean show) {
 		val col = testOverviewTable.columnModel.getColumn(1)
@@ -300,6 +318,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 
 	private def applyPreferences() {
 		val PreferenceModel preferences = preferenceModel
+		applyShowNumberOfRunsInHistory(preferences.numberOfRunsInHistory)
 		showDisabledCounterCheckBoxMenuItem.selected = preferences.showDisabledCounter
 		applyShowDisabledCounter(showDisabledCounterCheckBoxMenuItem.selected)
 		fixCheckBoxMenuItem(showDisabledCounterCheckBoxMenuItem) 
@@ -309,6 +328,9 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 		showInfoCounterCheckBoxMenuItem.selected = preferences.showInfoCounter
 		applyShowInfoCounter(showInfoCounterCheckBoxMenuItem.selected)
 		fixCheckBoxMenuItem(showInfoCounterCheckBoxMenuItem)
+		showTestDescriptionCheckBoxMenuItem.selected = preferences.showTestDescription
+		applyShowTestDescription(showTestDescriptionCheckBoxMenuItem.selected)
+		fixCheckBoxMenuItem(showTestDescriptionCheckBoxMenuItem)
 		showWarningIndicatorCheckBoxMenuItem.selected = preferences.showWarningIndicator
 		applyShowWarningIndicator(showWarningIndicatorCheckBoxMenuItem.selected)
 		fixCheckBoxMenuItem(showWarningIndicatorCheckBoxMenuItem)
@@ -328,7 +350,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 	private def setCurrentRun(Run run) {
 		if (run !== currentRun) {
 			currentRun = run
-			testOverviewTableModel.model = run.tests
+			testOverviewTableModel.setModel(run.tests, showTestDescriptionCheckBoxMenuItem.selected)
 			resetDerived
 			val item = new ComboBoxItem<String, String>(currentRun.reporterId, currentRun.name)
 			runComboBox.selectedItem = item
@@ -451,6 +473,9 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 		} else if (e.source == showInfoCounterCheckBoxMenuItem) {
 			applyShowInfoCounter(showInfoCounterCheckBoxMenuItem.selected)
 			fixCheckBoxMenuItem(showInfoCounterCheckBoxMenuItem)
+		} else if (e.source == showTestDescriptionCheckBoxMenuItem) {
+			applyShowTestDescription(showTestDescriptionCheckBoxMenuItem.selected)
+			fixCheckBoxMenuItem(showTestDescriptionCheckBoxMenuItem)
 		} else if (e.source == showWarningIndicatorCheckBoxMenuItem) {
 			applyShowWarningIndicator(showWarningIndicatorCheckBoxMenuItem.selected)
 			fixCheckBoxMenuItem(showWarningIndicatorCheckBoxMenuItem)
@@ -870,6 +895,9 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 		testOverviewRunWorksheetMenuItem.addActionListener(this)
 		testOverviewPopupMenu.add(testOverviewRunWorksheetMenuItem)
 		testOverviewPopupMenu.add(new JSeparator)
+		showTestDescriptionCheckBoxMenuItem = new JCheckBoxMenuItem(UtplsqlResources.getString("PREF_SHOW_TEST_DESCRIPTION_LABEL").replace("?",""), true)
+		showTestDescriptionCheckBoxMenuItem.addActionListener(this)
+		testOverviewPopupMenu.add(showTestDescriptionCheckBoxMenuItem)
 		showWarningIndicatorCheckBoxMenuItem = new JCheckBoxMenuItem(UtplsqlResources.getString("PREF_SHOW_WARNING_INDICATOR_LABEL").replace("?",""), true)
 		showWarningIndicatorCheckBoxMenuItem.addActionListener(this)
 		testOverviewPopupMenu.add(showWarningIndicatorCheckBoxMenuItem)

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

@@ -26,32 +26,47 @@ class TestOverviewTableModel extends DefaultTableModel {
 	LinkedHashMap<String, Test> tests
 	String commonPrefix
 	boolean commonPrefixCalculated
+	boolean showDescription
 
 	new() {
 		super()
 	}
 
 	private def calcCommonPrefix() {
-		if (!commonPrefixCalculated && tests.size > 0) {
+		if (!commonPrefixCalculated && tests !== null && tests.size > 0) {
 			this.commonPrefix = PrefixTools.commonPrefix(tests.keySet.toList)
 			fireTableDataChanged()
 			commonPrefixCalculated = true
 		}
 	}
 
-	def setModel(LinkedHashMap<String, Test> tests) {
+	def setModel(LinkedHashMap<String, Test> tests, boolean showDescription) {
 		commonPrefixCalculated = false
 		this.tests = tests
+		this.showDescription = showDescription
 		calcCommonPrefix
 		fireTableDataChanged()
 	}
 
+	def updateModel(boolean showDescription) {
+		this.showDescription = showDescription
+		fireTableDataChanged()
+	}
+	
 	def getTestIdColumnName() {
 		calcCommonPrefix
 		if (commonPrefix === null || commonPrefix == "") {
-			return UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN")
+			if (showDescription) {
+				UtplsqlResources.getString("RUNNER_DESCRIPTION_LABEL")
+			} else {
+				UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN")			
+			}
 		} else {
-			commonPrefix
+			if (showDescription) {
+				'''«UtplsqlResources.getString("RUNNER_DESCRIPTION_LABEL")» («commonPrefix»)'''
+			} else {
+				commonPrefix
+			}
 		}
 	}
 
@@ -88,7 +103,11 @@ class TestOverviewTableModel extends DefaultTableModel {
 				return test.infoIcon
 			}
 			case 3: {
-				return test.id.substring(if(commonPrefix === null) {0} else {commonPrefix.length})
+				return if(showDescription && test.description !== null) {
+							test.description
+						} else {
+							test.id.substring(if(commonPrefix === null) {0} else {commonPrefix.length})
+						}
 			}
 			case 4: {
 				return test.executionTime
@@ -100,7 +119,7 @@ class TestOverviewTableModel extends DefaultTableModel {
 	}
 
 	override getColumnName(int col) {
-		return #["", "", "", UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN"),
+		return #["", "", "", UtplsqlResources.getString(if (showDescription) {"RUNNER_DESCRIPTION_LABEL"} else {"RUNNER_TEST_ID_COLUMN"}),
 			UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME_COLUMN")].get(col)
 	}