Description Pavel Vlasov 2019-12-03 07:53:03 EST

There is no null check when an ArrayList is constructed from the choice of values. As a result an NPE is thrown and it becomes impossible to customize a property view by using a select if there is a choice of values, I had to resort to a Java service which catches the NPE and returns null.

Code (org.eclipse.sirius.ext.emf.edit.EditingDomainService line 549):

    public List<?> getPropertyDescriptorChoiceOfValues(EObject self, String featureName) {
        IItemPropertyDescriptor desc = getPropertyDescriptorForFeature(self, featureName);
        if (desc != null) {
            return new ArrayList<>(desc.getChoiceOfValues(self)); // The culprit line
        } else {
            return null;
        }
    }
 
Proposed fix:

    public List<?> getPropertyDescriptorChoiceOfValues(EObject self, String featureName) {
        IItemPropertyDescriptor desc = getPropertyDescriptorForFeature(self, featureName);
        if (desc != null) {
            Collection<Object> choices = desc.getChoiceOfValues(self);
            return choices == null ? null : new ArrayList<>(choices);
        } else {
            return null;
        }
    }