Skip to content

Commit ae018c7

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
add realtime reporter preferences
1 parent c1bb115 commit ae018c7

File tree

3 files changed

+140
-54
lines changed

3 files changed

+140
-54
lines changed

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ class PreferenceModel extends HashStructureAdapter {
3939
static final String KEY_CLEAR_SCREEN = "clearScreen"
4040
static final String KEY_AUTO_EXECUTE = "autoExecute"
4141
static final String KEY_CHECK_RUN_UTPLSQL_TEST = "checkRunUtplsqlTest"
42+
static final String KEY_SHOW_DISABLED_COUNTER = "showDisabledCounter"
43+
static final String KEY_SHOW_WARNINGS_COUNTER = "showWarningsCounter"
44+
static final String KEY_SHOW_INFO_COUNTER = "showInfoCounter"
45+
static final String KEY_SHOW_WARNING_INDICATOR = "showWarningIndicator"
46+
static final String KEY_SHOW_INFO_INDICATOR = "showInfoIndicator"
4247
static final String KEY_TEST_PACKAGE_PREFIX = "testPackagePrefix"
4348
static final String KEY_TEST_PACKAGE_SUFFIX = "testPackageSuffix"
4449
static final String KEY_TEST_UNIT_PREFIX = "testUnitPrefix"
@@ -102,6 +107,46 @@ class PreferenceModel extends HashStructureAdapter {
102107
getHashStructure.putBoolean(PreferenceModel.KEY_CHECK_RUN_UTPLSQL_TEST, checkRunUtplsqlTest)
103108
}
104109

110+
def isShowDisabledCounter() {
111+
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_DISABLED_COUNTER, false)
112+
}
113+
114+
def setShowDisabledCounter(boolean showDisabledCounter) {
115+
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_DISABLED_COUNTER, showDisabledCounter)
116+
}
117+
118+
def isShowWarningsCounter() {
119+
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_WARNINGS_COUNTER, false)
120+
}
121+
122+
def setShowWarningsCounter(boolean showWarningCounter) {
123+
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_WARNINGS_COUNTER, showWarningCounter)
124+
}
125+
126+
def isShowInfoCounter() {
127+
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_INFO_COUNTER, false)
128+
}
129+
130+
def setShowInfoCounter(boolean showInfoCounter) {
131+
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_INFO_COUNTER, showInfoCounter)
132+
}
133+
134+
def isShowWarningIndicator() {
135+
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_WARNING_INDICATOR, false)
136+
}
137+
138+
def setShowWarningIndicator(boolean showWarningIndicator) {
139+
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_WARNING_INDICATOR, showWarningIndicator)
140+
}
141+
142+
def isShowInfoIndicator() {
143+
return getHashStructure.getBoolean(PreferenceModel.KEY_SHOW_INFO_INDICATOR, false)
144+
}
145+
146+
def setShowInfoIndicator(boolean showInfoIndicator) {
147+
getHashStructure.putBoolean(PreferenceModel.KEY_SHOW_INFO_INDICATOR, showInfoIndicator)
148+
}
149+
105150
def getTestPackagePrefix() {
106151
return getHashStructure.getString(PreferenceModel.KEY_TEST_PACKAGE_PREFIX, "test_")
107152
}

‎sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.xtend‎

Lines changed: 89 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ class PreferencePanel extends DefaultTraversablePanel {
4343
val JCheckBox clearScreenCheckBox = new JCheckBox
4444
val JCheckBox autoExecuteCheckBox = new JCheckBox
4545
val JCheckBox checkRunUtplsqlTestCheckBox = new JCheckBox
46+
val JPanel realtimeReporterPanel = new JPanel
47+
val JCheckBox showDisabledCounterCheckBox = new JCheckBox
48+
val JCheckBox showWarningsCounterCheckBox = new JCheckBox
49+
val JCheckBox showInfoCounterCheckBox = new JCheckBox
50+
val JCheckBox showWarningIndicatorCheckBox = new JCheckBox
51+
val JCheckBox showInfoIndicatorCheckBox = new JCheckBox
4652
val JPanel generateTestPanel = new JPanel();
4753
val JTextField testPackagePrefixTextField = new JTextField
4854
val JTextField testPackageSuffixTextField = new JTextField
@@ -71,87 +77,108 @@ class PreferencePanel extends DefaultTraversablePanel {
7177

7278
private def layoutControls() {
7379
// run test group
74-
val FieldLayoutBuilder b1 = new FieldLayoutBuilder(runTestPanel)
75-
b1.alignLabelsLeft = true
76-
b1.add(
77-
b1.field.label.withText(UtplsqlResources.getString("PREF_USE_REALTIME_REPORTER_LABEL")).component(
80+
val FieldLayoutBuilder runTab = new FieldLayoutBuilder(runTestPanel)
81+
runTab.alignLabelsLeft = true
82+
runTab.add(
83+
runTab.field.label.withText(UtplsqlResources.getString("PREF_USE_REALTIME_REPORTER_LABEL")).component(
7884
useRealtimeReporterCheckBox))
79-
b1.add(
80-
b1.field.label.withText(UtplsqlResources.getString("PREF_UNSHARED_WORKSHEET_LABEL")).component(
85+
runTab.add(
86+
runTab.field.label.withText(UtplsqlResources.getString("PREF_UNSHARED_WORKSHEET_LABEL")).component(
8187
unsharedWorksheetCheckBox))
82-
b1.add(
83-
b1.field.label.withText(UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL")).component(
88+
runTab.add(
89+
runTab.field.label.withText(UtplsqlResources.getString("PREF_RESET_PACKAGE_LABEL")).component(
8490
resetPackageCheckBox))
85-
b1.add(
86-
b1.field.label.withText(UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL")).component(
91+
runTab.add(
92+
runTab.field.label.withText(UtplsqlResources.getString("PREF_CLEAR_SCREEN_LABEL")).component(
8793
clearScreenCheckBox))
88-
b1.add(
89-
b1.field.label.withText(UtplsqlResources.getString("PREF_AUTO_EXECUTE_LABEL")).component(
94+
runTab.add(
95+
runTab.field.label.withText(UtplsqlResources.getString("PREF_AUTO_EXECUTE_LABEL")).component(
9096
autoExecuteCheckBox))
91-
b1.add(
92-
b1.field.label.withText(UtplsqlResources.getString("PREF_CHECK_RUN_UTPLSQL_TEST_LABEL")).component(
97+
runTab.add(
98+
runTab.field.label.withText(UtplsqlResources.getString("PREF_CHECK_RUN_UTPLSQL_TEST_LABEL")).component(
9399
checkRunUtplsqlTestCheckBox))
94-
b1.addVerticalSpring
100+
runTab.addVerticalSpring
101+
102+
// realtime reporter group
103+
val FieldLayoutBuilder rrTab = new FieldLayoutBuilder(realtimeReporterPanel)
104+
rrTab.alignLabelsLeft = true
105+
rrTab.add(
106+
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_DISABLED_COUNTER_LABEL")).component(
107+
showDisabledCounterCheckBox))
108+
rrTab.add(
109+
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_WARNINGS_COUNTER_LABEL")).component(
110+
showWarningsCounterCheckBox))
111+
rrTab.add(
112+
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_INFO_COUNTER_LABEL")).component(
113+
showInfoCounterCheckBox))
114+
rrTab.add(
115+
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_WARNING_INDICATOR_LABEL")).component(
116+
showWarningIndicatorCheckBox))
117+
rrTab.add(
118+
runTab.field.label.withText(UtplsqlResources.getString("PREF_SHOW_INFO_INDICATOR_LABEL")).component(
119+
showInfoIndicatorCheckBox))
120+
rrTab.addVerticalSpring
95121

96122
// generate test group
97-
val FieldLayoutBuilder b2 = new FieldLayoutBuilder(generateTestPanel)
98-
b2.alignLabelsLeft = true
99-
b2.stretchComponentsWithNoButton = true
100-
b2.add(
101-
b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_PREFIX_LABEL")).component(
123+
val FieldLayoutBuilder generateTab = new FieldLayoutBuilder(generateTestPanel)
124+
generateTab.alignLabelsLeft = true
125+
generateTab.stretchComponentsWithNoButton = true
126+
generateTab.add(
127+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_PREFIX_LABEL")).component(
102128
testPackagePrefixTextField))
103-
b2.add(
104-
b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_SUFFIX_LABEL")).component(
129+
generateTab.add(
130+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_TEST_PACKAGE_SUFFIX_LABEL")).component(
105131
testPackageSuffixTextField))
106-
b2.add(
107-
b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_PREFIX_LABEL")).component(
132+
generateTab.add(
133+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_PREFIX_LABEL")).component(
108134
testUnitPrefixTextField))
109-
b2.add(
110-
b2.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_SUFFIX_LABEL")).component(
135+
generateTab.add(
136+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_TEST_UNIT_SUFFIX_LABEL")).component(
111137
testUnitSuffixTextField))
112-
b2.add(
113-
b2.field.label.withText(UtplsqlResources.getString("PREF_NUMBER_OF_TESTS_PER_UNIT_LABEL")).component(
138+
generateTab.add(
139+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_NUMBER_OF_TESTS_PER_UNIT_LABEL")).component(
114140
numberOfTestsPerUnitSpinner))
115-
b2.add(
116-
b2.field.label.withText(UtplsqlResources.getString("PREF_GENERATE_COMMENTS_LABEL")).component(
141+
generateTab.add(
142+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_GENERATE_COMMENTS_LABEL")).component(
117143
generateCommentsCheckBox))
118-
b2.add(
119-
b2.field.label.withText(UtplsqlResources.getString("PREF_DISABLE_TESTS_LABEL")).component(
144+
generateTab.add(
145+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_DISABLE_TESTS_LABEL")).component(
120146
disableTestsCheckBox))
121-
b2.add(
122-
b2.field.label.withText(UtplsqlResources.getString("PREF_SUITE_PATH_LABEL")).component(
147+
generateTab.add(
148+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_SUITE_PATH_LABEL")).component(
123149
suitePathTextField))
124-
b2.add(
125-
b2.field.label.withText(UtplsqlResources.getString("PREF_INDENT_SPACES_LABEL")).component(
150+
generateTab.add(
151+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_INDENT_SPACES_LABEL")).component(
126152
indentSpacesSpinner))
127-
b2.add(
128-
b2.field.label.withText(UtplsqlResources.getString("PREF_CHECK_GENERATE_UTPLSQL_TEST_LABEL")).component(
153+
generateTab.add(
154+
generateTab.field.label.withText(UtplsqlResources.getString("PREF_CHECK_GENERATE_UTPLSQL_TEST_LABEL")).component(
129155
checkGenerateUtplsqlTestCheckBox).button(createCodeTemplatesButton).withText(
130156
UtplsqlResources.getString("PREF_CREATE_CODE_TEMPLATES_BUTTON_LABEL")))
131-
b2.addVerticalSpring
157+
generateTab.addVerticalSpring
132158

133159
// oddgen group
134-
val FieldLayoutBuilder b3 = new FieldLayoutBuilder(oddgenPanel)
135-
b3.alignLabelsLeft = true
136-
b3.stretchComponentsWithNoButton = true
137-
b3.add(
138-
b3.field.label.withText(UtplsqlResources.getString("PREF_ROOT_FOLDER_IN_ODDGEN_VIEW_LABEL")).component(
160+
val FieldLayoutBuilder oddgenTab = new FieldLayoutBuilder(oddgenPanel)
161+
oddgenTab.alignLabelsLeft = true
162+
oddgenTab.stretchComponentsWithNoButton = true
163+
oddgenTab.add(
164+
oddgenTab.field.label.withText(UtplsqlResources.getString("PREF_ROOT_FOLDER_IN_ODDGEN_VIEW_LABEL")).component(
139165
rootFolderInOddgenViewTextField))
140-
b3.add(
141-
b3.field.label.withText(UtplsqlResources.getString("PREF_GENERATE_FILES_LABEL")).component(
166+
oddgenTab.add(
167+
oddgenTab.field.label.withText(UtplsqlResources.getString("PREF_GENERATE_FILES_LABEL")).component(
142168
generateFilesCheckBox))
143-
b3.add(
144-
b3.field.label.withText(UtplsqlResources.getString("PREF_OUTPUT_DIRECTORY_LABEL")).component(
169+
oddgenTab.add(
170+
oddgenTab.field.label.withText(UtplsqlResources.getString("PREF_OUTPUT_DIRECTORY_LABEL")).component(
145171
outputDirectoryTextField).button(outputDirectoryBrowse).withText(
146172
UtplsqlResources.getString("PREF_OUTPUT_DIRECTORY_BUTTON_LABEL")))
147-
b3.add(
148-
b3.field.label.withText(UtplsqlResources.getString("PREF_DELETE_EXISTING_FILES_LABEL")).component(
173+
oddgenTab.add(
174+
oddgenTab.field.label.withText(UtplsqlResources.getString("PREF_DELETE_EXISTING_FILES_LABEL")).component(
149175
deleteExistingFilesCheckBox))
150-
b3.addVerticalSpring
176+
oddgenTab.addVerticalSpring
151177

152178
// putting groups into tabbed panes
153179
val tabbedPane = new JTabbedPane()
154180
tabbedPane.add(UtplsqlResources.getString("MENU_RUN_TEST_LABEL"), runTestPanel)
181+
tabbedPane.add(UtplsqlResources.getString("MENU_REALTIME_REPORTER_LABEL"), realtimeReporterPanel)
155182
tabbedPane.add(UtplsqlResources.getString("MENU_GENERATE_TEST_LABEL"), generateTestPanel)
156183
tabbedPane.add("oddgen", oddgenPanel)
157184
val FieldLayoutBuilder builder = new FieldLayoutBuilder(this)
@@ -163,8 +190,7 @@ class PreferencePanel extends DefaultTraversablePanel {
163190
createCodeTemplatesButton.addActionListener(new ActionListener() {
164191
override actionPerformed(ActionEvent event) {
165192
saveCodeTemplates
166-
}
167-
193+
}
168194
})
169195

170196
// register action listener for directory chooser
@@ -276,6 +302,11 @@ class PreferencePanel extends DefaultTraversablePanel {
276302
clearScreenCheckBox.selected = info.clearScreen
277303
autoExecuteCheckBox.selected = info.autoExecute
278304
checkRunUtplsqlTestCheckBox.selected = info.checkRunUtplsqlTest
305+
showDisabledCounterCheckBox.selected = info.showDisabledCounter
306+
showWarningsCounterCheckBox.selected = info.showWarningsCounter
307+
showInfoCounterCheckBox.selected = info.showInfoCounter
308+
showWarningIndicatorCheckBox.selected = info.showWarningIndicator
309+
showInfoIndicatorCheckBox.selected = info.showInfoIndicator
279310
testPackagePrefixTextField.text = info.testPackagePrefix
280311
testPackageSuffixTextField.text = info.testPackageSuffix
281312
testUnitPrefixTextField.text = info.testUnitPrefix
@@ -302,6 +333,11 @@ class PreferencePanel extends DefaultTraversablePanel {
302333
info.clearScreen = clearScreenCheckBox.selected
303334
info.autoExecute = autoExecuteCheckBox.selected
304335
info.checkRunUtplsqlTest = checkRunUtplsqlTestCheckBox.selected
336+
info.showDisabledCounter = showDisabledCounterCheckBox.selected
337+
info.showWarningsCounter = showWarningsCounterCheckBox.selected
338+
info.showInfoCounter = showInfoCounterCheckBox.selected
339+
info.showWarningIndicator = showWarningIndicatorCheckBox.selected
340+
info.showInfoIndicator = showInfoIndicatorCheckBox.selected
305341
info.testPackagePrefix = testPackagePrefixTextField.text
306342
info.testPackageSuffix = testPackageSuffixTextField.text
307343
info.testUnitPrefix = testUnitPrefixTextField.text

‎sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.xtend‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ class PreferenceModelTest {
3030
Assert.assertFalse(model.clearScreen)
3131
Assert.assertTrue(model.autoExecute)
3232
Assert.assertFalse(model.checkRunUtplsqlTest)
33+
Assert.assertFalse(model.showDisabledCounter)
34+
Assert.assertFalse(model.showWarningsCounter)
35+
Assert.assertFalse(model.showInfoCounter)
36+
Assert.assertFalse(model.showWarningIndicator)
37+
Assert.assertFalse(model.showInfoIndicator)
3338
Assert.assertEquals("test_", model.testPackagePrefix)
3439
Assert.assertEquals("", model.testPackageSuffix)
3540
Assert.assertEquals("", model.testUnitPrefix)
@@ -44,5 +49,5 @@ class PreferenceModelTest {
4449
Assert.assertEquals(PreferenceModel.DEFAULT_OUTPUT_DIRECTORY, model.outputDirectory)
4550
Assert.assertEquals(false, model.deleteExistingFiles)
4651
Assert.assertEquals("utPLSQL", model.rootFolderInOddgenView)
47-
}
52+
}
4853
}

0 commit comments

Comments
 (0)