Project

General

Profile

« Previous | Next » 

Revision 7dce04a4

Added by Katja Luther over 7 years ago

fix #5692: adapt delete algorithm to annotatedLineEditor mechanisms

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotation.java
14 14
import org.apache.log4j.Logger;
15 15
import org.eclipse.jface.text.source.Annotation;
16 16

  
17
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
18
import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
19

  
17 20
/**
18 21
 * An <code>Annotation</code> which spans an entire line and holds an object associated
19 22
 * with the line in an <code>IEntityContainer</code>.
......
37 40
	private boolean markedAsMerged;
38 41
	private boolean markedAsNew;
39 42
	private T mergeTarget;
43
	private DeleteConfiguratorBase configurator= null;
40 44

  
41 45

  
42 46
	/**
......
184 188
			lineDisplayStrategy.setStatusMessage(entity + " deleted.", entity);
185 189
		}
186 190
	}
187

  
191
	 public void markAsDeleted(DeleteConfiguratorBase config) {
192
			super.markDeleted(true);
193
			this.configurator = config;
194
			if (!isMarkedAsMerged()) {
195
				lineDisplayStrategy.setStatusMessage(entity + " deleted.", entity);
196
			}
197
		}
188 198
	/* (non-Javadoc)
189 199
	 * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityContainer#markAsMerged(eu.etaxonomy.cdm.model.common.CdmBase)
190 200
	 */
......
248 258
    public void setEntity(Object entity) {
249 259
        this.entity = (T) entity;
250 260
    }
261

  
262
	public DeleteConfiguratorBase getDeleteConfigurator() {
263
		return this.configurator;
264
	}
265

  
266
	public void setDeleteConfigurator(DeleteConfiguratorBase config) {
267
		this.configurator = config;
268
		
269
	}
251 270
}

Also available in: Unified diff