Skip to content

Commit 9730d5f

Browse files
committed
Remove init code fordeprecated PreferenceConverter FONTDATA_* constants
Fixes #2904
1 parent 2285e46 commit 9730d5f

File tree

1 file changed

+12
-25
lines changed

1 file changed

+12
-25
lines changed

bundles/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceConverter.java

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,27 @@ public class PreferenceConverter {
7373
private static final String ENTRY_SEPARATOR = ";"; //$NON-NLS-1$
7474

7575
/**
76-
* The default-default value for <code>FontData[]</code> preferences.
77-
* Read-only.
76+
* The default-default value for <code>FontData</code> preferences. Read-only.
77+
* The value is hard coded to the object created via
78+
* {@link FontData#FontData()}.
7879
*
79-
* @deprecated this is not thread-safe and may contain invalid data at
80-
* startup. Call {@link #getFontDataArrayDefaultDefault()} from
81-
* the UI thread instead.
80+
* @deprecated Call {@link #getFontDataArrayDefaultDefault()}} from the UI
81+
* thread instead.
8282
*/
83-
@Deprecated
84-
public static FontData[] FONTDATA_ARRAY_DEFAULT_DEFAULT;
83+
@Deprecated(forRemoval = true, since = "2025-06")
84+
public static FontData FONTDATA_DEFAULT_DEFAULT = new FontData();
8585

8686
/**
87-
* The default-default value for <code>FontData</code> preferences.
88-
* Read-only.
87+
* Contains single {@link #FONTDATA_DEFAULT_DEFAULT} element.
8988
*
90-
* @deprecated this is not thread-safe and may contain invalid data at
91-
* startup. Call {@link #getFontDataArrayDefaultDefault()}} from
92-
* the UI thread instead.
89+
* @deprecated Call {@link #getFontDataArrayDefaultDefault()} from the UI thread
90+
* instead.
9391
*/
94-
@Deprecated
95-
public static FontData FONTDATA_DEFAULT_DEFAULT;
92+
@Deprecated(forRemoval = true, since = "2025-06")
93+
public static FontData[] FONTDATA_ARRAY_DEFAULT_DEFAULT = new FontData[] { FONTDATA_DEFAULT_DEFAULT };
9694

9795
private static FontData[] fontDataArrayDefaultDefault;
9896

99-
static {
100-
Display display = Display.getDefault();
101-
display.asyncExec(() -> {
102-
// Ensure that the deprecated FONTDATA_DEFAULT_DEFAULT and
103-
// FONTDATA_ARRAY_DEFAULT values
104-
// are initialized as soon as possible
105-
FONTDATA_ARRAY_DEFAULT_DEFAULT = getFontDataArrayDefaultDefault();
106-
FONTDATA_DEFAULT_DEFAULT = getFontDataArrayDefaultDefault()[0];
107-
});
108-
}
109-
11097
/**
11198
* private constructor to prevent instantiation.
11299
*/

0 commit comments

Comments
 (0)