Project

General

Profile

« Previous | Next » 

Revision 83d4b229

Added by Niels Hoffmann over 12 years ago

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java
251 251
					persistenceService.merge(annotation.getEntity(), annotation.getMergeTarget()); //  merge					
252 252
				} else {
253 253
					// TODO clarify w AM whether this needs to be executed on merged objects
254
					persistenceService.delete(annotation.getEntity()); // delete
254
					//persistenceService.delete(annotation.getEntity()); // delete
255 255
				}
256 256
			}
257 257
			model.clearDeletedAnnotations();

Also available in: Unified diff