Project

General

Profile

« Previous | Next » 

Revision 8136f2a8

Added by Patrick Plitzner over 6 years ago

ref #6909 Fix potential NPE

View differences:

eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
207 207
	@Inject
208 208
	@Optional
209 209
	private void updateCurrentTaxon(@UIEventTopic(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR)ITaxonEditor editor){
210
	    TaxonNode taxonNode = editor.getTaxon().getTaxonNodes().iterator().next();
211 210
	    viewer.refresh();
212
	    viewer.reveal(taxonNode);
213
	    viewer.setSelection(null);
214
	    Widget testFindItem = viewer.testFindItem(taxonNode);
215
	    if(testFindItem instanceof TreeItem){
216
	        viewer.getTree().select((TreeItem) testFindItem);
211
	    TaxonNode taxonNode = null;
212
	    if(editor.getTaxon()!=null && editor.getTaxon().getTaxonNodes()!=null){
213
	        taxonNode = editor.getTaxon().getTaxonNodes().iterator().next();
214
	        viewer.reveal(taxonNode);
215
	        viewer.setSelection(null);
216
	        Widget testFindItem = viewer.testFindItem(taxonNode);
217
	        if(testFindItem instanceof TreeItem){
218
	            viewer.getTree().select((TreeItem) testFindItem);
219
	        }
217 220
	    }
218 221
	}
219 222

  

Also available in: Unified diff