add "clear screen" preference, set worksheet state to "saved" (not dirty)

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/PreferencePanel.xtend

@@ -26,6 +26,7 @@ import org.utplsql.sqldev.resources.UtplsqlResources
 class PreferencePanel extends DefaultTraversablePanel {
 	val JCheckBox unsharedWorksheetCheckBox = new JCheckBox
 	val JCheckBox resetPackageCheckBox = new JCheckBox
+	val JCheckBox clearScreenCheckBox = new JCheckBox
 	val JCheckBox autoExecuteCheckBox = new JCheckBox
 
 	new() {
@@ -41,6 +42,9 @@ class PreferencePanel extends DefaultTraversablePanel {
 		builder.add(
 			builder.field.label.withText(UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL")).component(
 				resetPackageCheckBox))
+		builder.add(
+			builder.field.label.withText(UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL")).component(
+				clearScreenCheckBox))
 		builder.add(
 			builder.field.label.withText(UtplsqlResources.getString("PREF_AUTO_EXECUTE_LABEL")).component(
 				autoExecuteCheckBox))
@@ -51,6 +55,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 		var PreferenceModel info = traversableContext.userInformation
 		unsharedWorksheetCheckBox.selected = info.unsharedWorksheet
 		resetPackageCheckBox.selected = info.resetPackage
+		clearScreenCheckBox.selected = info.clearScreen
 		autoExecuteCheckBox.selected = info.autoExecute
 		super.onEntry(traversableContext)
 	}
@@ -59,6 +64,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 		var PreferenceModel info = traversableContext.userInformation
 		info.unsharedWorksheet = unsharedWorksheetCheckBox.selected
 		info.resetPackage = resetPackageCheckBox.selected
+		info.clearScreen = clearScreenCheckBox.selected
 		info.autoExecute = autoExecuteCheckBox.selected
 		super.onExit(traversableContext)
 	}

sqldev/src/main/java/org/utplsql/sqldev/editor/menu/UtplsqlEditorController.xtend

@@ -14,15 +14,13 @@
  */
 package org.utplsql.sqldev.editor.menu
 
-import java.awt.Dimension
 import java.util.logging.Logger
 import javax.swing.JEditorPane
 import javax.swing.JSplitPane
 import oracle.dbtools.raptor.navigator.impl.DatabaseSourceNode
 import oracle.dbtools.raptor.utils.Connections
 import oracle.dbtools.worksheet.editor.OpenWorksheetWizard
 import oracle.dbtools.worksheet.editor.Worksheet
-import oracle.dbtools.worksheet.editor.WorksheetGUI
 import oracle.dbtools.worksheet.utils.WorksheetUtil
 import oracle.ide.Context
 import oracle.ide.Ide
@@ -96,14 +94,17 @@ class UtplsqlEditorController implements Controller {
 						EXECUTE dbms_session.reset_package;
 					«ENDIF»
 					SET SERVEROUTPUT ON SIZE 1000000
-					CLEAR SCREEN
+					«IF preferences.clearScreen»
+						CLEAR SCREEN
+					«ENDIF»
 					EXECUTE ut.run('«parser.getPathAt(position)»');
 				'''
 				val worksheet = OpenWorksheetWizard.openNewTempWorksheet(connectionName, code) as Worksheet
 				if (connectionName === null) {
 					worksheet.comboConnection = null
 				}
 				WorksheetUtil.setWorksheetTabName(worksheet.context.node.URL, UtplsqlResources.getString("WORKSHEET_TITLE"));
+				worksheet.context.node.markDirty(false);
 				if (preferences.autoExecute) {
 					Thread.sleep(100) // give worksheet time to initialize
 					val action = Ide.getIdeActionMap.get(Ide.findCmdID("Worksheet.RunScript")) as IdeAction

sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.xtend

@@ -33,6 +33,7 @@ class PreferenceModel extends HashStructureAdapter {
 
 	static final String KEY_UNSHARED_WORKSHEET = "unsharedWorksheet"
 	static final String KEY_RESET_PACKAGE = "resetPackage"
+	static final String KEY_CLEAR_SCREEN = "clearScreen"
 	static final String KEY_AUTO_EXECUTE = "autoExecute"
 
 	def isUnsharedWorksheet() {
@@ -50,6 +51,14 @@ class PreferenceModel extends HashStructureAdapter {
 	def setResetPackage(boolean resetPackage) {
 		getHashStructure.putBoolean(PreferenceModel.KEY_RESET_PACKAGE, resetPackage)
 	}
+	
+	def isClearScreen() {
+		return getHashStructure.getBoolean(PreferenceModel.KEY_CLEAR_SCREEN, false)
+	}
+
+	def setClearScreen(boolean clearScreen) {
+		getHashStructure.putBoolean(PreferenceModel.KEY_CLEAR_SCREEN, clearScreen)
+	}
 
 	def isAutoExecute() {
 		return getHashStructure.getBoolean(PreferenceModel.KEY_AUTO_EXECUTE, true)

sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources.properties

@@ -9,8 +9,9 @@ MIN_SQLDEV_VERSION=12.2.19.0.7
 
 # Translatable text
 PREF_LABEL=utPLSQL
+PREF_UNSHARED_WORKSHEET_LABEL=Open an unshared worksheet?
 PREF_RESET_PACKAGE_LABEL=Reset package before running utPLSQL?
+PREF_CLEAR_SCREEN_LABEL=Clear script output panel before running utPLSQL?
 PREF_AUTO_EXECUTE_LABEL=Execute unit test automatically?
-PREF_UNSHARED_WORKSHEET_LABEL=Open an unshared worksheet for utPLSQL execution?
 MENU_RUN_TEST_LABEL=Run utPLSQL test
 WORKSHEET_TITLE=utPLSQL

sqldev/src/test/java/org/utplsql/sqldev/preferences/tests/PreferenceModelTest.xtend

@@ -26,6 +26,7 @@ class PreferenceModelTest {
 		val PreferenceModel model = PreferenceModel.getInstance(null)
 		Assert.assertTrue(model.unsharedWorksheet)
 		Assert.assertFalse(model.resetPackage)
+		Assert.assertFalse(model.clearScreen)
 		Assert.assertTrue(model.autoExecute)
 	}	
 }