Project

General

Profile

« Previous | Next » 

Revision 717636b2

Added by Patrick Plitzner almost 6 years ago

Fix potential NPE

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
128 128
			UuidAndTitleCache uuidAndTitleCache = (UuidAndTitleCache) element;
129 129
			String titleCache = uuidAndTitleCache.getTitleCache();
130 130
			String abbrevTitleCache = uuidAndTitleCache.getAbbrevTitleCache();
131
			if (!titleCache.equals(abbrevTitleCache)){
132
				abbrevTitleCache += " - " + titleCache;
133
			}
134
			if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_ID_IN_ENTITY_SELECTION_DIAOLOG)){
135
				abbrevTitleCache += " ["+uuidAndTitleCache.getId()+"]";
131
			if(titleCache!=null && abbrevTitleCache!=null){
132
			    if (!titleCache.equals(abbrevTitleCache)){
133
			        abbrevTitleCache += " - " + titleCache;
134
			    }
135
			    if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_ID_IN_ENTITY_SELECTION_DIAOLOG)){
136
			        abbrevTitleCache += " ["+uuidAndTitleCache.getId()+"]";
137
			    }
136 138
			}
137
            return abbrevTitleCache;
139
            return abbrevTitleCache!=null?abbrevTitleCache:"[title null]";
138 140
		}
139
	};
141
	}
140 142

  
141 143
	/** {@inheritDoc} */
142 144
//	@Override

Also available in: Unified diff