boolean (@NotNull Scale scale) { if (overriddenScales != null) { overriddenScales.remove(scale.type); // previous override should not prevent this override } boolean updated = setScale(scale); if (overriddenScales == null) { overriddenScales = EnumSet.of(scale.type); } else { overriddenScales.add(scale.type); } return updated; }