Project

General

Profile

« Previous | Next » 

Revision d4066259

Added by Andreas Müller about 3 years ago

cleanup and subtasks for referencing objects progress monitor

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
211 211
				monitor.beginTask("Calculating referencing objects", 100);
212 212
				actualUuid = entityUUID;
213 213

  
214
				monitor.worked(5);
214
				monitor.worked(2);
215 215
				referencingObjects = new ArrayList<>();
216 216
				if(monitor.isCanceled()) {
217 217
				    actualUuid = null;
......
223 223
				}
224 224
				actualMonitor = monitor;
225 225
				if (entityUUID != null){
226
				    monitor.subTask("Load data from server");
226 227
	                referencingObjectsSet = getReferencingObjects(entityUUID, objectClass);
227 228

  
228 229
	                if(monitor.isCanceled()) {
......
230 231

  
231 232
	                    return Status.CANCEL_STATUS;
232 233
	                }
233
	                monitor.worked(30);
234
	                monitor.worked(33);
235
                    monitor.subTask("Sort");
234 236
	                referencingObjects = sortReferencing();
235 237
	                if (referencingObjects == null){
236 238
	                    if (monitor.isCanceled()){
......
243 245
	                if(monitor.isCanceled()) {
244 246
	                    return Status.CANCEL_STATUS;
245 247
	                }
246
	                monitor.worked(80);
248
	                monitor.worked(35);
249
	                monitor.subTask("Update View");
247 250

  
248 251
	                updateView();
252
	                monitor.worked(30);
249 253
				}
250 254
				monitor.done();
251 255
				actualMonitor = null;
252 256

  
253 257
				return Status.OK_STATUS;
254

  
255

  
256 258
			}
257 259
		};
258 260
		currentJob.setUser(true);
......
331 333
	private List<CdmBase> sortReferencing(){
332 334

  
333 335
	    if (referencingObjectsSet != null){
334
            List<CdmBase> referencingObjects = new ArrayList<CdmBase>(referencingObjectsSet);
336
            List<CdmBase> referencingObjects = new ArrayList<>(referencingObjectsSet);
335 337
            try{
336 338
                Collections.sort(referencingObjects, new ReferencingClassComparator());
337 339
            }catch (RemoteAccessException e){
......
361 363
				    return o1.getUuid().compareTo(o2.getUuid());
362 364
				}
363 365
			}
364
				return result;
366
			return result;
365 367
		}
366 368
	}
367 369

  
......
397 399
                    contentDescription.setText(description.replace("&", "&&"));
398 400
                }
399 401
            }
400

  
401 402
         });
402 403
	 }
403 404

  
......
436 437
		    if (referencedCdmObject.getUuid() == actualUuid){
437 438
		        return;
438 439
		    }
439
		    if (referencedCdmObject != null){
440
                if(referencedCdmObject.isInstanceOf(IdentifiableEntity.class)){
441
                    referencedObjectTitleCache = (HibernateProxyHelper.deproxy(referencedCdmObject, IdentifiableEntity.class)).getTitleCache();
442
                }
443
                else if(referencedCdmObject.isInstanceOf(DescriptionElementBase.class)){
444
                    referencedObjectTitleCache = DescriptionHelper.getLabel(referencedCdmObject);
445
                }
446
                else if (referencedCdmObject.isInstanceOf(User.class)){
447
                    referencedObjectTitleCache = ((User)referencedCdmObject).getUsername();
448
                }else if (referencedCdmObject.isInstanceOf(TaxonNode.class)){
449
                    referencedObjectTitleCache = "TaxonNode of "+(HibernateProxyHelper.deproxy(referencedCdmObject, TaxonNode.class)).getTaxon().getTitleCache();
450
                }
451
		    }
440
	        if(referencedCdmObject.isInstanceOf(IdentifiableEntity.class)){
441
                referencedObjectTitleCache = (HibernateProxyHelper.deproxy(referencedCdmObject, IdentifiableEntity.class)).getTitleCache();
442
            }
443
            else if(referencedCdmObject.isInstanceOf(DescriptionElementBase.class)){
444
                referencedObjectTitleCache = DescriptionHelper.getLabel(referencedCdmObject);
445
            }
446
            else if (referencedCdmObject.isInstanceOf(User.class)){
447
                referencedObjectTitleCache = ((User)referencedCdmObject).getUsername();
448
            }else if (referencedCdmObject.isInstanceOf(TaxonNode.class)){
449
                referencedObjectTitleCache = "TaxonNode of "+(HibernateProxyHelper.deproxy(referencedCdmObject, TaxonNode.class)).getTaxon().getTitleCache();
450
            }
452 451
		    if (referencedObjectTitleCache != null){
453 452
		        updateDescription(referencedCdmObject.getUserFriendlyTypeName() + " '" + referencedObjectTitleCache + "' is referenced by:");
454 453
		    } else{

Also available in: Unified diff