Skip to content

Commit c0cbbf5

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
move static string resources to resource bundle
1 parent f4fe251 commit c0cbbf5

File tree

4 files changed

+59
-27
lines changed

4 files changed

+59
-27
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -565,15 +565,15 @@ class RunnerPanel implements FocusListener, ActionListener {
565565
toolbar.floatable = false
566566
toolbar.border = new EmptyBorder(new Insets(2, 2, 2, 2)) // top, left, bottom, right
567567
refreshButton = new ToolbarButton(UtplsqlResources.getIcon("REFRESH_ICON"))
568-
refreshButton.toolTipText = "Reset ordering and refresh"
568+
refreshButton.toolTipText = UtplsqlResources.getString("RUNNER_REFRESH_BUTTON")
569569
refreshButton.addActionListener(this)
570570
toolbar.add(refreshButton)
571571
rerunButton = new ToolbarButton(UtplsqlResources.getIcon("RUN_ICON"))
572-
rerunButton.toolTipText = "Rerun all tests"
572+
rerunButton.toolTipText = UtplsqlResources.getString("RUNNER_RERUN_TOOLTIP")
573573
rerunButton.addActionListener(this)
574574
toolbar.add(rerunButton)
575575
rerunWorksheetButton = new ToolbarButton(UtplsqlResources.getIcon("RUN_WORKSHEET_ICON"))
576-
rerunWorksheetButton.toolTipText = "Rerun all tests in a new worksheet"
576+
rerunWorksheetButton.toolTipText = UtplsqlResources.getString("RUNNER_RERUN_WORKSHEET_TOOLTIP")
577577
rerunWorksheetButton.addActionListener(this)
578578
toolbar.add(rerunWorksheetButton)
579579
toolbar.add(Box.createHorizontalGlue())
@@ -585,7 +585,7 @@ class RunnerPanel implements FocusListener, ActionListener {
585585
runComboBox.addActionListener(this)
586586
toolbar.add(runComboBox)
587587
clearButton = new ToolbarButton(UtplsqlResources.getIcon("CLEAR_ICON"))
588-
clearButton.toolTipText = "Clear history"
588+
clearButton.toolTipText = UtplsqlResources.getString("RUNNER_CLEAR_HISTORY_BUTTON")
589589
clearButton.addActionListener(this)
590590
toolbar.add(clearButton)
591591
c.gridx = 0
@@ -725,10 +725,10 @@ class RunnerPanel implements FocusListener, ActionListener {
725725

726726
// Context menu for test overview
727727
val testOverviewPopupMenu = new JPopupMenu
728-
testOverviewRunMenuItem = new JMenuItem("Run test", UtplsqlResources.getIcon("RUN_ICON"));
728+
testOverviewRunMenuItem = new JMenuItem(UtplsqlResources.getString("RUNNER_RUN_MENUITEM"), UtplsqlResources.getIcon("RUN_ICON"));
729729
testOverviewRunMenuItem.addActionListener(this)
730730
testOverviewPopupMenu.add(testOverviewRunMenuItem)
731-
testOverviewRunWorksheetMenuItem = new JMenuItem("Run test in new worksheet", UtplsqlResources.getIcon("RUN_WORKSHEET_ICON"));
731+
testOverviewRunWorksheetMenuItem = new JMenuItem(UtplsqlResources.getString("RUNNER_RUN_WORKSHEET_MENUITEM"), UtplsqlResources.getIcon("RUN_WORKSHEET_ICON"));
732732
testOverviewRunWorksheetMenuItem.addActionListener(this)
733733
testOverviewPopupMenu.add(testOverviewRunWorksheetMenuItem)
734734
testOverviewPopupMenu.add(new JSeparator)
@@ -747,7 +747,7 @@ class RunnerPanel implements FocusListener, ActionListener {
747747
val testInfoPanel = new ScrollablePanel
748748
testInfoPanel.setLayout(new GridBagLayout())
749749
// - Owner
750-
val testOwnerLabel = new JLabel("Owner")
750+
val testOwnerLabel = new JLabel(UtplsqlResources.getString("RUNNER_OWNER_LABEL"))
751751
c.gridx = 0
752752
c.gridy = 0
753753
c.gridwidth = 1
@@ -771,7 +771,7 @@ class RunnerPanel implements FocusListener, ActionListener {
771771
c.weighty = 0
772772
testInfoPanel.add(testOwnerTextField, c)
773773
// - Package
774-
val testPackageLabel = new JLabel("Package")
774+
val testPackageLabel = new JLabel(UtplsqlResources.getString("RUNNER_PACKAGE_LABEL"))
775775
c.gridx = 0
776776
c.gridy = 1
777777
c.gridwidth = 1
@@ -795,7 +795,7 @@ class RunnerPanel implements FocusListener, ActionListener {
795795
c.weighty = 0
796796
testInfoPanel.add(testPackageTextField, c)
797797
// - Procedure
798-
val testProcedureLabel = new JLabel("Procedure")
798+
val testProcedureLabel = new JLabel(UtplsqlResources.getString("RUNNER_PROCEDURE_LABEL"))
799799
c.gridx = 0
800800
c.gridy = 2
801801
c.gridwidth = 1
@@ -819,7 +819,7 @@ class RunnerPanel implements FocusListener, ActionListener {
819819
c.weighty = 0
820820
testInfoPanel.add(testProcedureTextField, c)
821821
// - Description
822-
val testDescriptionLabel = new JLabel(UtplsqlResources.getString("RUNNER_DESCRIPTION"))
822+
val testDescriptionLabel = new JLabel(UtplsqlResources.getString("RUNNER_DESCRIPTION_LABEL"))
823823
c.gridx = 0
824824
c.gridy = 3
825825
c.gridwidth = 1
@@ -847,7 +847,7 @@ class RunnerPanel implements FocusListener, ActionListener {
847847
c.weighty = 0
848848
testInfoPanel.add(testDescriptionTextArea, c)
849849
// - Suitepath (id)
850-
val testIdLabel = new JLabel("Suitepath")
850+
val testIdLabel = new JLabel(UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN"))
851851
c.gridx = 0
852852
c.gridy = 4
853853
c.gridwidth = 1
@@ -875,7 +875,7 @@ class RunnerPanel implements FocusListener, ActionListener {
875875
c.weighty = 0
876876
testInfoPanel.add(testIdTextArea, c)
877877
// - Start
878-
val testStartLabel = new JLabel("Start")
878+
val testStartLabel = new JLabel(UtplsqlResources.getString("RUNNER_START_LABEL"))
879879
c.gridx = 0
880880
c.gridy = 5
881881
c.gridwidth = 1
@@ -1012,11 +1012,11 @@ class RunnerPanel implements FocusListener, ActionListener {
10121012

10131013
// split pane with all tabs
10141014
testDetailTabbedPane = new JTabbedPane()
1015-
testDetailTabbedPane.add("Test", testPropertiesScrollPane)
1016-
testDetailTabbedPane.add("Failures", failuresSplitPane)
1017-
testDetailTabbedPane.add("Errors", testErrorStackPanel)
1018-
testDetailTabbedPane.add("Warnings", testWarningsPanel)
1019-
testDetailTabbedPane.add("Info", testServerOutputPanel)
1015+
testDetailTabbedPane.add(UtplsqlResources.getString("RUNNER_TEST_TAB_LABEL"), testPropertiesScrollPane)
1016+
testDetailTabbedPane.add(UtplsqlResources.getString("RUNNER_FAILURES_TAB_LABEL"), failuresSplitPane)
1017+
testDetailTabbedPane.add(UtplsqlResources.getString("RUNNER_ERRORS_TAB_LABEL"), testErrorStackPanel)
1018+
testDetailTabbedPane.add(UtplsqlResources.getString("RUNNER_WARNINGS_TAB_LABEL"), testWarningsPanel)
1019+
testDetailTabbedPane.add(UtplsqlResources.getString("RUNNER_INFO_TAB_LABEL"), testServerOutputPanel)
10201020
val horizontalSplitPane = new JSplitPane(SwingConstants.HORIZONTAL, testOverviewScrollPane, testDetailTabbedPane)
10211021
horizontalSplitPane.resizeWeight = 0.5
10221022
c.gridx = 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TestOverviewTableModel extends DefaultTableModel {
4949
def getTestIdColumnName() {
5050
calcCommonPrefix
5151
if (commonPrefix === null || commonPrefix == "") {
52-
return UtplsqlResources.getString("RUNNER_TEST_ID")
52+
return UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN")
5353
} else {
5454
commonPrefix
5555
}
@@ -100,8 +100,8 @@ class TestOverviewTableModel extends DefaultTableModel {
100100
}
101101

102102
override getColumnName(int col) {
103-
return #["", "", "", UtplsqlResources.getString("RUNNER_TEST_ID"),
104-
UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME")].get(col)
103+
return #["", "", "", UtplsqlResources.getString("RUNNER_TEST_ID_COLUMN"),
104+
UtplsqlResources.getString("RUNNER_TEST_EXECUTION_TIME_COLUMN")].get(col)
105105
}
106106

107107
override isCellEditable(int row, int column) {

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ WINDOW_RUN_BUTTON=Run
6464
WINDOW_CANCEL_BUTTON=Cancel
6565
WORKSHEET_TITLE=utPLSQL
6666
RUNNER_VIEW_TITLE=utPLSQL
67+
RUNNER_REFRESH_TOOLTOP=Reset ordering and refresh
68+
RUNNER_RERUN_TOOLTIP=Rerun all tests
69+
RUNNER_CLEAR_BUTTON=Clear history
70+
RUNNER_RERUN_WORKSHEET_TOOLTIP=Rerun all tests in a new worksheet
6771
RUNNER_TESTS_LABEL=Tests
6872
RUNNER_FAILURES_LABEL=Failures
6973
RUNNER_ERRORS_LABEL=Errors
@@ -74,6 +78,18 @@ RUNNER_INITIALIZING_TEXT=Initializing...
7478
RUNNER_RUNNING_TEXT=Running tests...
7579
RUNNER_FINNISHED_TEXT=Finished after %.3f seconds.
7680
RUNNER_NO_TESTS_FOUND_TEXT=No tests found.
77-
RUNNER_TEST_ID=Suitepath
78-
RUNNER_TEST_EXECUTION_TIME=Time [s]
79-
RUNNER_DESCRIPTION=Description
81+
RUNNER_RUN_MENUITEM=Run test
82+
RUNNER_RUN_WORKSHEET_MENUITEM=Run test in new worksheet
83+
RUNNER_TEST_ID_COLUMN=Suitepath
84+
RUNNER_TEST_EXECUTION_TIME_COLUMN=Time [s]
85+
RUNNER_OWNER_LABEL=Owner
86+
RUNNER_PACKAGE_LABEL=Package
87+
RUNNER_PROCEDURE_LABEL=Procedure
88+
RUNNER_DESCRIPTION_LABEL=Description
89+
RUNNER_START_LABEL=Start
90+
RUNNER_ASSERT_DESCRIPTION_COLUMN=Assert description (failed line)
91+
RUNNER_TEST_TAB_LABEL=Test
92+
RUNNER_FAILURES_TAB_LABEL=Failures
93+
RUNNER_ERRORS_TAB_LABEL=Errors
94+
RUNNER_WARNINGS_TAB_LABEL=Warnings
95+
RUNNER_INFO_TAB_LABEL=Info

‎sqldev/src/main/resources/org/utplsql/sqldev/resources/UtplsqlResources_de.properties‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ WINDOW_EXCLUDE_OBJECS_LABEL=Exkludierte Objekte
4242
WINDOW_RUN_BUTTON=Start
4343
WINDOW_CANCEL_BUTTON=Abbrechen
4444
WORKSHEET_TITLE=utPLSQL
45-
RUNNER_VIEW_TITLE=utPLSQL
45+
RUNNER_VIEW_TITLE=utPLSQL
46+
RUNNER_REFRESH_TOOLTIP=Sortierung zurücksetzen und aktualisieren
47+
RUNNER_RERUN_TOOLTIP=Alle Tests erneut ausführen
48+
RUNNER_RERUN_WORKSHEET_TOOLTIP=Alle Tests in einem neuen Arbeitsblatt erneut ausführen
49+
RUNNER_CLEAR_BUTTON=History löschen
4650
RUNNER_TESTS_LABEL=Tests
4751
RUNNER_FAILURES_LABEL=Fehlschläge
4852
RUNNER_ERRORS_LABEL=Fehler
@@ -53,6 +57,18 @@ RUNNER_INITIALIZING_TEXT=Initialisierung...
5357
RUNNER_RUNNING_TEXT=Starte Tests...
5458
RUNNER_FINNISHED_TEXT=Beendet nach %.3f Sekunden.
5559
RUNNER_NO_TESTS_FOUND_TEXT=Keine Tests gefunden.
56-
RUNNER_TEST_ID=Suitepath
57-
RUNNER_TEST_EXECUTION_TIME=Zeit [s]
58-
RUNNER_DESCRIPTION=Beschreibung
60+
RUNNER_RUN_MENUITEM=Run testTest ausführen
61+
RUNNER_RUN_WORKSHEET_MENUITEM=Test in neuem Arbeitsblatt ausführuen
62+
RUNNER_TEST_ID_COLUMN_NAME=Suitepath
63+
RUNNER_TEST_EXECUTION_TIME_COLUMN_NAME=Zeit [s]
64+
RUNNER_OWNER_LABEL=Besitzer
65+
RUNNER_PACKAGE_LABEL=Paket
66+
RUNNER_PROCEDURE_LABEL=Prozedur
67+
RUNNER_DESCRIPTION_LABEL=Beschreibung
68+
RUNNER_START_LABEL=Start
69+
RUNNER_ASSERT_DESCRIPTION_COLUMN_NAME=Assert Beschreibung (gescheiterte Zeile)
70+
RUNNER_TEST_TAB_LABEL=Test
71+
RUNNER_FAILURES_TAB_LABEL=Misserfolge
72+
RUNNER_ERRORS_TAB_LABEL=Fehler
73+
RUNNER_WARNINGS_TAB_LABEL=Warnungen
74+
RUNNER_INFO_TAB_LABEL=Info

0 commit comments

Comments
 (0)