Skip to content

Commit d24e4cf

Browse files
committed
8263481: Specification of JComponent::setDefaultLocale doesn't mention that passing 'null' restores VM's default locale
Reviewed-by: aivanov
1 parent 1a21f77 commit d24e4cf

File tree

2 files changed

+50
-0
lines changed

2 files changed

+50
-0
lines changed

src/java.desktop/share/classes/javax/swing/JComponent.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2851,6 +2851,8 @@ public static Locale getDefaultLocale() {
28512851
* potentially multiple lightweight applications running in a single VM)
28522852
* can have their own setting. An applet can safely alter its default
28532853
* locale because it will have no affect on other applets (or the browser).
2854+
* Passing {@code null} will reset the current locale back
2855+
* to VM's default locale.
28542856
*
28552857
* @param l the desired default <code>Locale</code> for new components.
28562858
* @see #getDefaultLocale
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/* @test
25+
@bug 8263481
26+
@summary Verifies calling setDefaultLocale(null) will reset
27+
to VM's default locale
28+
@run main TestNullLocale
29+
*/
30+
31+
import javax.swing.JComponent;
32+
import java.util.Locale;
33+
34+
public class TestNullLocale {
35+
public static void main(String[] args) {
36+
Locale defaultLocale = JComponent.getDefaultLocale();
37+
JComponent.setDefaultLocale(Locale.GERMAN);
38+
JComponent.setDefaultLocale(null);
39+
Locale currentLocale = JComponent.getDefaultLocale();
40+
if (defaultLocale != currentLocale) {
41+
System.out.println("currentLocale " + currentLocale);
42+
System.out.println("defaultLocale " + defaultLocale);
43+
throw new RuntimeException("locale not reset to default locale");
44+
}
45+
}
46+
}
47+
48+

0 commit comments

Comments
 (0)