Skip to content

Fix some nullable types in JOptionPane. #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpovirk merged 1 commit into from
Feb 9, 2026
Merged

Fix some nullable types in JOptionPane. #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/java.desktop/share/classes/javax/swing/JOptionPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ public class JOptionPane extends JComponent implements Accessible
/** Message to display. */
protected transient @Nullable Object message;
/** Options to display to the user. */
protected transient @Nullable Object[] options;
protected transient Object @Nullable [] options;
/** Value that should be initially selected in <code>options</code>. */
protected transient @Nullable Object initialValue;
/** Message type. */
Expand All @@ -424,7 +424,7 @@ public class JOptionPane extends JComponent implements Accessible
protected transient @Nullable Object value;
/** Array of values the user can choose from. Look and feel will
* provide the UI component to choose this from. */
protected transient @Nullable Object[] selectionValues;
protected transient Object @Nullable [] selectionValues;
/** Value the user has input. */
protected transient @Nullable Object inputValue;
/** Initial value to select in <code>selectionValues</code>. */
Expand Down Expand Up @@ -578,7 +578,7 @@ public static String showInputDialog(@Nullable Component parentComponent,
@SuppressWarnings("deprecation")
public static Object showInputDialog(@Nullable Component parentComponent,
@Nullable Object message, @Nullable String title, int messageType, @Nullable Icon icon,
@Nullable Object[] selectionValues, @Nullable Object initialSelectionValue)
Object @Nullable [] selectionValues, @Nullable Object initialSelectionValue)
throws HeadlessException {
JOptionPane pane = new JOptionPane(message, messageType,
OK_CANCEL_OPTION, icon,
Expand Down Expand Up @@ -868,7 +868,7 @@ public static int showConfirmDialog(@Nullable Component parentComponent,
@SuppressWarnings("deprecation")
public static int showOptionDialog(@Nullable Component parentComponent,
@Nullable Object message, @Nullable String title, int optionType, int messageType,
@Nullable Icon icon, @Nullable Object[] options, @Nullable Object initialValue)
@Nullable Icon icon, Object @Nullable [] options, @Nullable Object initialValue)
throws HeadlessException {
JOptionPane pane = new JOptionPane(message, messageType,
optionType, icon,
Expand Down Expand Up @@ -1302,8 +1302,8 @@ private static boolean checkFrameForComponent(@Nullable Component parentComponen
public static int showInternalOptionDialog(@Nullable Component parentComponent,
@Nullable Object message,
@Nullable String title, int optionType,
int messageType, Icon icon,
@Nullable Object[] options, @Nullable Object initialValue) {
int messageType, @Nullable Icon icon,
Object @Nullable [] options, @Nullable Object initialValue) {
JOptionPane pane = new JOptionPane(message, messageType,
optionType, icon, options, initialValue);
pane.putClientProperty(PopupFactory_FORCE_HEAVYWEIGHT_POPUP,
Expand Down Expand Up @@ -1440,7 +1440,7 @@ public static String showInternalInputDialog(@Nullable Component parentComponent
*/
public static Object showInternalInputDialog(@Nullable Component parentComponent,
@Nullable Object message, @Nullable String title, int messageType, @Nullable Icon icon,
@Nullable Object[] selectionValues, @Nullable Object initialSelectionValue) {
Object @Nullable [] selectionValues, @Nullable Object initialSelectionValue) {
JOptionPane pane = new JOptionPane(message, messageType,
OK_CANCEL_OPTION, icon, null, null);
pane.putClientProperty(PopupFactory_FORCE_HEAVYWEIGHT_POPUP,
Expand Down Expand Up @@ -1805,7 +1805,7 @@ public JOptionPane(@Nullable Object message, int messageType, int optionType,
* @param options the choices the user can select
*/
public JOptionPane(@Nullable Object message, int messageType, int optionType,
@Nullable Icon icon, @Nullable Object[] options) {
@Nullable Icon icon, Object @Nullable [] options) {
this(message, messageType, optionType, icon, options, null);
}

Expand Down Expand Up @@ -1833,7 +1833,7 @@ public JOptionPane(@Nullable Object message, int messageType, int optionType,
* only meaningful if <code>options</code> is used
*/
public JOptionPane(@Nullable Object message, int messageType, int optionType,
@Nullable Icon icon, @Nullable Object[] options, @Nullable Object initialValue) {
@Nullable Icon icon, Object @Nullable [] options, @Nullable Object initialValue) {

this.message = message;
this.options = options == null ? null : Arrays.copyOf(options, options.length);
Expand Down Expand Up @@ -1993,7 +1993,7 @@ public void setValue(@Nullable Object newValue) {
*/
@BeanProperty(description
= "The option pane's options objects.")
public void setOptions(@Nullable Object[] newOptions) {
public void setOptions(Object @Nullable [] newOptions) {
Object[] oldOptions = options;

options = newOptions == null
Expand All @@ -2008,7 +2008,7 @@ public void setOptions(@Nullable Object[] newOptions) {
*
* @see #setOptions
*/
public @Nullable Object[] getOptions() {
public Object @Nullable [] getOptions() {
return options == null ? null : Arrays.copyOf(options, options.length);
}

Expand Down Expand Up @@ -2155,7 +2155,7 @@ public int getOptionType() {
*/
@BeanProperty(description
= "The option pane's selection values.")
public void setSelectionValues(@Nullable Object[] newValues) {
public void setSelectionValues(Object @Nullable [] newValues) {
Object[] oldValues = selectionValues;

selectionValues = newValues == null
Expand All @@ -2172,7 +2172,7 @@ public void setSelectionValues(@Nullable Object[] newValues) {
* @return the array of <code>Objects</code> the user can select
* @see #setSelectionValues
*/
public @Nullable Object[] getSelectionValues() {
public Object @Nullable [] getSelectionValues() {
return selectionValues == null
? null
: Arrays.copyOf(selectionValues, selectionValues.length);
Expand Down