Skip to content

Commit 8339637

Browse files
Abhishek Kumarpull[bot]
Abhishek Kumar
authored andcommitted
8308588: Unnecessary synchronized on GTKStyle#ICONS_MAP can be removed
Reviewed-by: tr, aivanov, aturbanov
1 parent 0affb69 commit 8339637

File tree

1 file changed

+17
-20
lines changed
  • src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk

1 file changed

+17
-20
lines changed

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java

+17-20
Original file line numberDiff line numberDiff line change
@@ -888,11 +888,7 @@ else if ("CheckBox.iconTextGap".equals(key) ||
888888
}
889889

890890
// 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);
896892
if (stockIcon != null) {
897893
return stockIcon;
898894
}
@@ -1179,27 +1175,28 @@ public Object createValue(UIDefaults table) {
11791175
CLASS_SPECIFIC_MAP.put("EditorPane.caretForeground", "cursor-color");
11801176
CLASS_SPECIFIC_MAP.put("EditorPane.caretAspectRatio", "cursor-aspect-ratio");
11811177

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));
11891185

11901186
//check whether the gtk version is >= 3.10 as the Icon names were
11911187
//changed from this version
11921188
UNIXToolkit tk = (UNIXToolkit)Toolkit.getDefaultToolkit();
11931189
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));
11981194
} 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));
12031199
}
1200+
ICONS_MAP = Collections.unmodifiableMap(iconsMap);
12041201
}
12051202
}

0 commit comments

Comments
 (0)