@@ -888,11 +888,7 @@ else if ("CheckBox.iconTextGap".equals(key) ||
888
888
}
889
889
890
890
// Is it a stock icon ?
891
- GTKStockIcon stockIcon = null ;
892
- synchronized (ICONS_MAP ) {
893
- stockIcon = ICONS_MAP .get (key );
894
- }
895
-
891
+ GTKStockIcon stockIcon = ICONS_MAP .get (key );
896
892
if (stockIcon != null ) {
897
893
return stockIcon ;
898
894
}
@@ -1179,27 +1175,28 @@ public Object createValue(UIDefaults table) {
1179
1175
CLASS_SPECIFIC_MAP .put ("EditorPane.caretForeground" , "cursor-color" );
1180
1176
CLASS_SPECIFIC_MAP .put ("EditorPane.caretAspectRatio" , "cursor-aspect-ratio" );
1181
1177
1182
- ICONS_MAP = new HashMap <String , GTKStockIcon >();
1183
- ICONS_MAP .put ("FileChooser.cancelIcon" , new GTKStockIcon ("gtk-cancel" , 4 ));
1184
- ICONS_MAP .put ("FileChooser.okIcon" , new GTKStockIcon ("gtk-ok" , 4 ));
1185
- ICONS_MAP .put ("OptionPane.yesIcon" , new GTKStockIcon ("gtk-yes" , 4 ));
1186
- ICONS_MAP .put ("OptionPane.noIcon" , new GTKStockIcon ("gtk-no" , 4 ));
1187
- ICONS_MAP .put ("OptionPane.cancelIcon" , new GTKStockIcon ("gtk-cancel" , 4 ));
1188
- ICONS_MAP .put ("OptionPane.okIcon" , new GTKStockIcon ("gtk-ok" , 4 ));
1178
+ Map < String , GTKStockIcon > iconsMap = new HashMap <>();
1179
+ iconsMap .put ("FileChooser.cancelIcon" , new GTKStockIcon ("gtk-cancel" , 4 ));
1180
+ iconsMap .put ("FileChooser.okIcon" , new GTKStockIcon ("gtk-ok" , 4 ));
1181
+ iconsMap .put ("OptionPane.yesIcon" , new GTKStockIcon ("gtk-yes" , 4 ));
1182
+ iconsMap .put ("OptionPane.noIcon" , new GTKStockIcon ("gtk-no" , 4 ));
1183
+ iconsMap .put ("OptionPane.cancelIcon" , new GTKStockIcon ("gtk-cancel" , 4 ));
1184
+ iconsMap .put ("OptionPane.okIcon" , new GTKStockIcon ("gtk-ok" , 4 ));
1189
1185
1190
1186
//check whether the gtk version is >= 3.10 as the Icon names were
1191
1187
//changed from this version
1192
1188
UNIXToolkit tk = (UNIXToolkit )Toolkit .getDefaultToolkit ();
1193
1189
if (tk .checkGtkVersion (3 , 10 , 0 )) {
1194
- ICONS_MAP .put ("OptionPane.errorIcon" , new GTKStockIcon ("dialog-error" , 6 ));
1195
- ICONS_MAP .put ("OptionPane.informationIcon" , new GTKStockIcon ("dialog-information" , 6 ));
1196
- ICONS_MAP .put ("OptionPane.warningIcon" , new GTKStockIcon ("dialog-warning" , 6 ));
1197
- ICONS_MAP .put ("OptionPane.questionIcon" , new GTKStockIcon ("dialog-question" , 6 ));
1190
+ iconsMap .put ("OptionPane.errorIcon" , new GTKStockIcon ("dialog-error" , 6 ));
1191
+ iconsMap .put ("OptionPane.informationIcon" , new GTKStockIcon ("dialog-information" , 6 ));
1192
+ iconsMap .put ("OptionPane.warningIcon" , new GTKStockIcon ("dialog-warning" , 6 ));
1193
+ iconsMap .put ("OptionPane.questionIcon" , new GTKStockIcon ("dialog-question" , 6 ));
1198
1194
} else {
1199
- ICONS_MAP .put ("OptionPane.errorIcon" , new GTKStockIcon ("gtk-dialog-error" , 6 ));
1200
- ICONS_MAP .put ("OptionPane.informationIcon" , new GTKStockIcon ("gtk-dialog-info" , 6 ));
1201
- ICONS_MAP .put ("OptionPane.warningIcon" , new GTKStockIcon ("gtk-dialog-warning" , 6 ));
1202
- ICONS_MAP .put ("OptionPane.questionIcon" , new GTKStockIcon ("gtk-dialog-question" , 6 ));
1195
+ iconsMap .put ("OptionPane.errorIcon" , new GTKStockIcon ("gtk-dialog-error" , 6 ));
1196
+ iconsMap .put ("OptionPane.informationIcon" , new GTKStockIcon ("gtk-dialog-info" , 6 ));
1197
+ iconsMap .put ("OptionPane.warningIcon" , new GTKStockIcon ("gtk-dialog-warning" , 6 ));
1198
+ iconsMap .put ("OptionPane.questionIcon" , new GTKStockIcon ("gtk-dialog-question" , 6 ));
1203
1199
}
1200
+ ICONS_MAP = Collections .unmodifiableMap (iconsMap );
1204
1201
}
1205
1202
}
0 commit comments