Skip to content

Commit dd27825

Browse files
authored
Merge pull request #9520 from mbien/fix-ui-property-typo
Fix typo in nb.output.background UI property
2 parents caa37a4 + d8e23c9 commit dd27825

5 files changed

Lines changed: 19 additions & 5 deletions

File tree

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,11 @@ protected static Color getColorSuccess(InputOutput io) {
268268
}
269269

270270
protected static Color getDefaultColorBackground() {
271-
Color back = UIManager.getColor("nb.output.backgorund"); //NOI18N
271+
Color back = UIManager.getColor("nb.output.background"); //NOI18N
272+
if (back == null) {
273+
// deprecated
274+
back = UIManager.getColor("nb.output.backgorund"); //NOI18N
275+
}
272276
if (back == null) {
273277
back = UIManager.getColor("TextField.background"); //NOI18N
274278
if (back == null) {

ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ private static Color getDefaultColorStandard() {
126126
}
127127

128128
private static Color getDefaultColorBackground() {
129-
Color back = UIManager.getColor("nb.output.backgorund"); //NOI18N
129+
Color back = UIManager.getColor("nb.output.background"); //NOI18N
130+
if (back == null) {
131+
// deprecated
132+
back = UIManager.getColor("nb.output.backgorund"); //NOI18N
133+
}
130134
if (back == null) {
131135
back = UIManager.getColor("TextField.background"); //NOI18N
132136
if (back == null) {

platform/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,7 @@ <h3 id="SceneAnimatorMethods">SceneAnimator Methods</h3>
19501950
<td>Returns the zoom animator of the scene.
19511951
<tr>
19521952
<td>getColorAnimator
1953-
<td>Returns the color animator which controls backgorund and foreground animation of all widgets in the scene.
1953+
<td>Returns the color animator which controls background and foreground animation of all widgets in the scene.
19541954
</table>
19551955

19561956
<p>

platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public enum LinkStyle {
6464
public static final String PROP_COLOR_LINK_IMPORTANT =
6565
"color.link.important"; //NOI18N
6666
public static final String PROP_COLOR_BACKGROUND =
67-
"color.backgorund"; //NOI18N
67+
"color.background"; //NOI18N
6868
public static final String PROP_COLOR_WARNING = "color.warning"; //NOI18N
6969
public static final String PROP_COLOR_FAILURE = "color.failure"; //NOI18N
7070
public static final String PROP_COLOR_SUCCESS = "color.success"; //NOI18N
@@ -668,7 +668,11 @@ static Color getDefaultColorStandard() {
668668
}
669669

670670
static Color getDefaultColorBackground() {
671-
Color back = UIManager.getColor("nb.output.backgorund"); //NOI18N
671+
Color back = UIManager.getColor("nb.output.background"); //NOI18N
672+
if (back == null) {
673+
// deprecated
674+
back = UIManager.getColor("nb.output.backgorund"); //NOI18N
675+
}
672676
if (back == null) {
673677
back = UIManager.getColor("TextField.background"); //NOI18N
674678
if (back == null) {

platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ nb.diff.sidebar.changed.color=rgb(30, 75, 112)
183183

184184
# output
185185
nb.output.foreground=@foreground
186+
nb.output.background=#2B2B2B
187+
# deprecated
186188
nb.output.backgorund=#2B2B2B
187189
nb.output.selectionBackground=#214283
188190
nb.output.err.foreground=#FF4040

0 commit comments

Comments
 (0)