Project

General

Profile

Revision 7d6b1e3a

ID7d6b1e3ae75fcdfd9c9d81538b346debbe68e640
Parent ee53ccf7
Child e001877d

Added by Andreas Kohlbecker over 1 year ago

ref #8107 ref #8099 reverting changes which have been picked from hotfix branch in favour of the better implementation in the develop branch

View differences:

src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java
607 607
            while(parentComponent != null){
608 608
                logger.debug("parentComponent: " + parentComponent.getClass().getSimpleName());
609 609
                if(NestedFieldGroup.class.isAssignableFrom(parentComponent.getClass()) && AbstractField.class.isAssignableFrom(parentComponent.getClass())){
610
                    try {
610
                    Optional<FieldGroup> parentFieldGroup = ((NestedFieldGroup)parentComponent).getFieldGroup();
611 611
                    if(parentFieldGroup.isPresent()){
612 612
                        Object propId = parentFieldGroup.get().getPropertyId(parentField);
613 613
                        if(propId != null){
......
616 616
                        }
617 617
                        logger.debug("parentField: " + parentField.getClass().getSimpleName());
618 618
                        parentField = (Field)parentComponent;
619
                    } catch (NullPointerException e){
620
                        String causeDetail = "NullPointerException";
621
                        if(((NestedFieldGroup)parentComponent).getFieldGroup() == null){
622
                            causeDetail = "parentComponent.getFieldGroup() is NULL, this should not happen.";
623
                        }
624
                        logger.error(causeDetail, e);
619
                    } else {
620
                        logger.debug("parentFieldGroup is null, continuing ...");
625 621
                    }
626 622
                } else if(parentComponent == this) {
627 623
                    // we reached the editor itself
......
890 886
        }
891 887
    }
892 888

  
889

  
893 890
    // ------------------------ issue related temporary solutions --------------------- //
894 891
    /**
895 892
     * Publicly accessible equivalent to getPreseneter(), needed for

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)