add checkGenerateUtplsqlTest, group preferences

Author: PhilippSalvisberg

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

@@ -15,7 +15,9 @@
  */
 package org.utplsql.sqldev
 
+import javax.swing.BorderFactory
 import javax.swing.JCheckBox
+import javax.swing.JPanel
 import javax.swing.JSpinner
 import javax.swing.JTextField
 import javax.swing.SpinnerNumberModel
@@ -27,55 +29,69 @@ import org.utplsql.sqldev.model.preference.PreferenceModel
 import org.utplsql.sqldev.resources.UtplsqlResources
 
 class PreferencePanel extends DefaultTraversablePanel {
+	val JPanel runTestPanel = new JPanel();
 	val JCheckBox unsharedWorksheetCheckBox = new JCheckBox
 	val JCheckBox resetPackageCheckBox = new JCheckBox
 	val JCheckBox clearScreenCheckBox = new JCheckBox
 	val JCheckBox autoExecuteCheckBox = new JCheckBox
 	val JCheckBox checkRunUtplsqlTestCheckBox = new JCheckBox
+	val JPanel generateTestPanel = new JPanel();
 	val JTextField testPackagePrefixTextField = new JTextField
 	val JTextField testPackageSuffixTextField = new JTextField
 	val JTextField testUnitPrefixTextField = new JTextField
 	val JTextField testUnitSuffixTextField = new JTextField
 	val SpinnerNumberModel numberOfTestsPerUnitModel = new SpinnerNumberModel(1, 1, 10, 1);
 	val JSpinner numberOfTestsPerUnitSpinner = new JSpinner(numberOfTestsPerUnitModel);
+	val JCheckBox checkGenerateUtplsqlTestCheckBox = new JCheckBox
 
 	new() {
 		layoutControls()
 	}
 
 	def private layoutControls() {
-		val FieldLayoutBuilder builder = new FieldLayoutBuilder(this)
-		builder.alignLabelsLeft = true
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_UNSHARED_WORKSHEET_LABEL")).component(
+		runTestPanel.border = BorderFactory.createTitledBorder(UtplsqlResources.getString("MENU_RUN_TEST_LABEL"))
+		val FieldLayoutBuilder b1 = new FieldLayoutBuilder(runTestPanel)
+		b1.alignLabelsLeft = true
+		b1.add(
+			b1.field.label.withText(UtplsqlResources.getString("PREF_UNSHARED_WORKSHEET_LABEL")).component(
 				unsharedWorksheetCheckBox))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL")).component(
+		b1.add(
+			b1.field.label.withText(UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL")).component(
 				resetPackageCheckBox))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL")).component(
+		b1.add(
+			b1.field.label.withText(UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL")).component(
 				clearScreenCheckBox))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_AUTO_EXECUTE_LABEL")).component(
+		b1.add(
+			b1.field.label.withText(UtplsqlResources.getString("PREF_AUTO_EXECUTE_LABEL")).component(
 				autoExecuteCheckBox))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_CHECK_RUN_UTPLSQL_TEST_LABEL")).component(
+		b1.add(
+			b1.field.label.withText(UtplsqlResources.getString("PREF_CHECK_RUN_UTPLSQL_TEST_LABEL")).component(
 				checkRunUtplsqlTestCheckBox))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_PREFIX_LABEL")).component(
+		generateTestPanel.border = BorderFactory.createTitledBorder(UtplsqlResources.getString("MENU_GENERATE_TEST_LABEL"))
+		val FieldLayoutBuilder b2 = new FieldLayoutBuilder(generateTestPanel)
+		b2.alignLabelsLeft = true
+		b2.add(
+			b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_PREFIX_LABEL")).component(
 				testPackagePrefixTextField))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_SUFFIX_LABEL")).component(
+		b2.add(
+			b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_SUFFIX_LABEL")).component(
 				testPackageSuffixTextField))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_PREFIX_LABEL")).component(
+		b2.add(
+			b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_PREFIX_LABEL")).component(
 				testUnitPrefixTextField))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_SUFFIX_LABEL")).component(
+		b2.add(
+			b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_SUFFIX_LABEL")).component(
 				testUnitSuffixTextField))
-		builder.add(
-			builder.field.label.withText(UtplsqlResources.getString("PREF_NUMBER_OF_TESTS_PER_UNIT")).component(
+		b2.add(
+			b2.field.label.withText(UtplsqlResources.getString("PREF_NUMBER_OF_TESTS_PER_UNIT")).component(
 				numberOfTestsPerUnitSpinner))
+		b2.add(
+			b2.field.label.withText(UtplsqlResources.getString("PREF_CHECK_GENERATE_UTPLSQL_TEST_LABEL")).component(
+				checkGenerateUtplsqlTestCheckBox))
+		val FieldLayoutBuilder builder = new FieldLayoutBuilder(this)
+		builder.alignLabelsLeft = true
+		builder.addVerticalField("", runTestPanel)
+		builder.addVerticalField("", generateTestPanel)
 		builder.addVerticalSpring
 	}
 
@@ -91,6 +107,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 		testUnitPrefixTextField.text = info.testUnitPrefix
 		testUnitSuffixTextField.text = info.testUnitSuffix
 		numberOfTestsPerUnitSpinner.value = info.numberOfTestsPerUnit
+		checkGenerateUtplsqlTestCheckBox.selected = info.checkGenerateUtplsqlTest
 		super.onEntry(traversableContext)
 	}
 
@@ -106,6 +123,7 @@ class PreferencePanel extends DefaultTraversablePanel {
 		info.testUnitPrefix = testUnitPrefixTextField.text
 		info.testUnitSuffix = testUnitSuffixTextField.text
 		info.numberOfTestsPerUnit = numberOfTestsPerUnitSpinner.value as Integer
+		info.checkGenerateUtplsqlTest = checkGenerateUtplsqlTestCheckBox.selected
 		super.onExit(traversableContext)
 	}