- String string = Cache.getDefault("DEFAULT_COLOUR", "None");
- colour.setSelectedItem(string);
+ String oldProp = Cache.getDefault(DEFAULT_COLOUR, "None");
+ String newProp = Cache.getDefault(DEFAULT_COLOUR_PROT, null);
+ protColour.setSelectedItem(newProp != null ? newProp : oldProp);
+ newProp = Cache.getDefault(DEFAULT_COLOUR_NUC, null);
+ nucColour.setSelectedItem(newProp != null ? newProp : oldProp);