Project

General

Profile

« Previous | Next » 

Revision 8c2c68ce

Added by Katja Luther almost 4 years ago

fix NPE in reference bulk editor

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
79 79 
        }
80 80 
        else if(property.equals(PROPERTY_PUBLICATION_YEAR)){
81 81 
            if (cdmBase.getDatePublished() != null){
82 
                String result = cdmBase.getDatePublished().getYear();
83 
                if (!cdmBase.getDatePublished().getYear().equals(cdmBase.getDatePublishedString()) && cdmBase.getDatePublishedString() != null) {
82 
                String result = "";
83 
                if (cdmBase.getDatePublished().getYear() != null){
84 
                    result = cdmBase.getDatePublished().getYear();
85 
                }
86 
                if (cdmBase.getDatePublishedString() != null && !result.equals(cdmBase.getDatePublishedString()) ) {
84 87 
                    result += " (" + cdmBase.getDatePublishedString()+")";
85 88 
                }
86 89 
                return result ;
87 90 
            }else if(cdmBase.getDatePublished() == null && cdmBase.getInReference() != null ){
88 
                String result = cdmBase.getInReference().getDatePublished().getYear();
89 
                if (!cdmBase.getInReference().getDatePublished().getYear().equals(cdmBase.getInReference().getDatePublishedString()) ) {
91 
                String result = "";
92 
                if (cdmBase.getInReference().getDatePublished() != null && cdmBase.getInReference().getDatePublished().getYear() != null){
93 
                    result = cdmBase.getInReference().getDatePublished().getYear();
94 
                }
95 
                if (cdmBase.getInReference().getDatePublishedString() != null && !result.equals(cdmBase.getInReference().getDatePublishedString()) ) {
90 96 
                    result += " (" + cdmBase.getInReference().getDatePublishedString()+")";
91 97 
                }
92 98 
                return result ;

Also available in: Unified diff