Project

General

Profile

« Previous | Next » 

Revision 880f5390

Added by Andreas Müller about 3 years ago

ref #9541 refactor Open..Handlers to all use UuidAndTitleCache as input and some more changes and bugfixes

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
235 235
				    monitor.subTask("Load data from server");
236 236
				    monitor.worked(1);
237 237
	                Set<ReferencingObjectDto> refObjectsFromServer = loadReferencingObjects(entityUUID, objectClass);
238
	                if (refObjectsFromServer == null){
239
	                    return Status.CANCEL_STATUS;  //TODO is this correct?, null can happen e.g. if server call throws exception
240
	                }
238 241
	                monitor.worked(25);
239 242
	                if(monitor.isCanceled()) {
240 243
//	                  actualUuid = null;
......
246 249
	                monitor.worked(1);//maybe this helps to update the subtask label
247 250

  
248 251
	                //TODO have a status line instead
249
	                updateDescriptionLabel(description + "(n="+referencingObjectsSet.size()+")"); //
252
	                int count = referencingObjectsSet == null? 0: referencingObjectsSet.size();
253
	                updateDescriptionLabel(CdmUtils.Nz(description) + "(n="+count+")"); //
250 254

  
251 255

  
252 256
	                List<ReferencingObjectDto> localDtos = sortToList(referencingObjectsSet, monitor);
......
479 483
			firstElement = ((TaxonNode)firstElement).getClassification();
480 484
		}
481 485
		if(firstElement instanceof CdmBase){
482
		    CdmBase referencedCdmObject = (CdmBase) firstElement;
486
		    firstElement= CdmBase.deproxy(firstElement, CdmBase.class);
487
		    CdmBase referencedCdmObject = (CdmBase)firstElement;
483 488
		    if (referencedCdmObject.getUuid() == actualUuid){
484 489
		        return;
485 490
		    }

Also available in: Unified diff