Changeset 11552 in josm for trunk/src/org

Timestamp:

2017-02-12T12:51:09+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14353 - robustness to systems not defining standard Java UI color constants

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

@@ -16 +16 @@
 import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -42 +41 @@
 
     static {
-        UIDefaults defaults = UIManager.getDefaults();
-        SELECTED_BG = new ColorProperty(marktr("Discardable key: selection Background"),
-                defaults.getColor("Table.selectionBackground")).cached();
-        NORMAL_BG = new ColorProperty(marktr("Discardable key: background"),
-                defaults.getColor("Table.background")).cached();
+        Color selectionBackground = UIManager.getColor("Table.selectionBackground");
+        if (selectionBackground == null) {
+            selectionBackground = Color.BLUE;
+        }
+        SELECTED_BG = new ColorProperty(marktr("Discardable key: selection Background"), selectionBackground).cached();
+        Color background = UIManager.getColor("Table.background");
+        if (background == null) {
+            background = Color.WHITE;
+        }
+        NORMAL_BG = new ColorProperty(marktr("Discardable key: background"), background).cached();
     }
 
@@ -57 +61 @@
             c.setBackground((isSelected ? SELECTED_BG : NORMAL_BG).get());
         } else {
-            UIDefaults defaults = UIManager.getDefaults();
-            c.setForeground(defaults.getColor("Table."+(isSelected ? "selectionF" : "f")+"oreground"));
-            c.setBackground(defaults.getColor("Table."+(isSelected ? "selectionB" : "b")+"ackground"));
+            c.setForeground(UIManager.getColor("Table."+(isSelected ? "selectionF" : "f")+"oreground"));
+            c.setBackground(UIManager.getColor("Table."+(isSelected ? "selectionB" : "b")+"ackground"));
         }
     }