diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java index 60ac8da9f28c..e9a128c4dec2 100644 --- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java +++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java @@ -268,7 +268,11 @@ protected static Color getColorSuccess(InputOutput io) { } protected static Color getDefaultColorBackground() { - Color back = UIManager.getColor("nb.output.backgorund"); //NOI18N + Color back = UIManager.getColor("nb.output.background"); //NOI18N + if (back == null) { + // dprecated + back = UIManager.getColor("nb.output.backgorund"); //NOI18N + } if (back == null) { back = UIManager.getColor("TextField.background"); //NOI18N if (back == null) { diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java index 7dcf652fa1f4..4b0877238961 100644 --- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java +++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java @@ -126,7 +126,11 @@ private static Color getDefaultColorStandard() { } private static Color getDefaultColorBackground() { - Color back = UIManager.getColor("nb.output.backgorund"); //NOI18N + Color back = UIManager.getColor("nb.output.background"); //NOI18N + if (back == null) { + // dprecated + back = UIManager.getColor("nb.output.backgorund"); //NOI18N + } if (back == null) { back = UIManager.getColor("TextField.background"); //NOI18N if (back == null) { diff --git a/platform/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html b/platform/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html index 895c4693c21b..4f626e78ce27 100644 --- a/platform/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html +++ b/platform/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html @@ -1950,7 +1950,7 @@
diff --git a/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java b/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java index 87413f47fb50..bf7adc7df538 100644 --- a/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java +++ b/platform/core.output2/src/org/netbeans/core/output2/options/OutputOptions.java @@ -64,7 +64,7 @@ public enum LinkStyle { public static final String PROP_COLOR_LINK_IMPORTANT = "color.link.important"; //NOI18N public static final String PROP_COLOR_BACKGROUND = - "color.backgorund"; //NOI18N + "color.background"; //NOI18N public static final String PROP_COLOR_WARNING = "color.warning"; //NOI18N public static final String PROP_COLOR_FAILURE = "color.failure"; //NOI18N public static final String PROP_COLOR_SUCCESS = "color.success"; //NOI18N @@ -668,7 +668,11 @@ static Color getDefaultColorStandard() { } static Color getDefaultColorBackground() { - Color back = UIManager.getColor("nb.output.backgorund"); //NOI18N + Color back = UIManager.getColor("nb.output.background"); //NOI18N + if (back == null) { + // dprecated + back = UIManager.getColor("nb.output.backgorund"); //NOI18N + } if (back == null) { back = UIManager.getColor("TextField.background"); //NOI18N if (back == null) { diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties index a90887a7a209..b5fc8abf37cb 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties @@ -183,6 +183,8 @@ nb.diff.sidebar.changed.color=rgb(30, 75, 112) # output nb.output.foreground=@foreground +# deprecated +nb.output.background=#2B2B2B nb.output.backgorund=#2B2B2B nb.output.selectionBackground=#214283 nb.output.err.foreground=#FF4040